Merge branch 'master' into 12.1-RC6

Author: SentryMan

inject-generator/pom.xml

@@ -57,7 +57,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-spi-service</artifactId>
-      <version>2.13</version>
+      <version>2.14-RC1</version>
     </dependency>
 
     <dependency>

inject-generator/src/main/java/io/avaje/inject/generator/ScopeInfo.java

@@ -151,7 +151,10 @@ private String initName(String topPackage) {
   void initialiseName(String topPackage) throws IOException {
     emptyModule = topPackage == null;
     if (!emptyModule) {
-      var defaultPackage = APContext.getProjectModuleElement().isUnnamed() && APContext.elements().getPackageElement(topPackage) == null;
+      var defaultPackage =
+          !topPackage.contains(".")
+              && APContext.getProjectModuleElement().isUnnamed()
+              && APContext.elements().getPackageElement(topPackage) == null;
       modulePackage = defaultPackage ? "" : topPackage;
       final String name = defaultPackage ? "Default" : initName(modulePackage);
       moduleShortName = name + "Module";

inject/src/main/java/io/avaje/inject/DBeanScopeBuilder.java

@@ -230,7 +230,7 @@ private static boolean detectAvajeConfig() {
       .orElseGet(() -> {
         try {
           return Configuration.class != null;
-        } catch (NoClassDefFoundError e) {
+        } catch (Throwable e) {
           return false;
         }
       });