Merge branch 'master' into tidy-deprecations

Author: SentryMan

blackbox-aspect/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>10.6-SNAPSHOT</version>
+    <version>10.7-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

blackbox-other/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>10.6-SNAPSHOT</version>
+    <version>10.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>blackbox-other</artifactId>

blackbox-test-inject/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>10.6-SNAPSHOT</version>
+    <version>10.7-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

inject-aop/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>10.6-SNAPSHOT</version>
+    <version>10.7-SNAPSHOT</version>
   </parent>
   <artifactId>avaje-inject-aop</artifactId>
   <dependencies>

inject-aop/src/main/java/io/avaje/inject/aop/Aspect.java

@@ -4,7 +4,7 @@
 import static java.lang.annotation.RetentionPolicy.*;
 import java.lang.annotation.*;
 
-import io.avaje.inject.aop.Aspect.Import.List;
+import io.avaje.inject.aop.Aspect.Import.Imports;
 
 /**
  * Meta annotation used to define an Aspect.
@@ -38,7 +38,7 @@
    * Marks an External Annotation as being used for aspects
    */
   @Retention(SOURCE)
-  @Repeatable(List.class)
+  @Repeatable(Imports.class)
   @Target({PACKAGE, TYPE, MODULE})
   @interface Import {
 
@@ -56,7 +56,7 @@
 
     @Retention(SOURCE)
     @Target({TYPE, PACKAGE, MODULE})
-    @interface List {
+    @interface Imports {
 
       Import[] value();
     }

inject-events/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>10.6-SNAPSHOT</version>
+    <version>10.7-SNAPSHOT</version>
   </parent>
   <artifactId>avaje-inject-events</artifactId>
   <name>avaje inject events</name>

inject-generator/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>10.6-SNAPSHOT</version>
+    <version>10.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>avaje-inject-generator</artifactId>

inject-gradle-plugin/build.gradle

@@ -6,15 +6,15 @@ plugins {
 }
 
 group 'io.avaje.inject'
-version '10.5'
+version '10.6'
 
 repositories {
   mavenLocal()
   mavenCentral()
 }
 
 dependencies {
-  implementation 'io.avaje:avaje-inject:10.5'
+  implementation 'io.avaje:avaje-inject:10.6'
   implementation gradleApi()
 
   testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'

inject-gradle-plugin/src/main/java/io/avaje/inject/plugin/AvajeInjectPlugin.java

@@ -7,8 +7,9 @@
 import io.avaje.inject.spi.InjectPlugin;
 import io.avaje.inject.spi.InjectExtension;
 
-import org.gradle.api.*;
-
+import org.gradle.api.Project;
+import org.gradle.api.Task;
+import org.gradle.api.GradleException;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -22,7 +23,7 @@
 /**
  * Plugin that discovers external avaje inject modules and plugins.
  */
-public class AvajeInjectPlugin implements Plugin<Project> {
+public class AvajeInjectPlugin implements org.gradle.api.Plugin<Project> {
 
   private final List<ModuleData> modules = new ArrayList<>();
 

inject-maven-plugin/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>10.6-SNAPSHOT</version>
+    <version>10.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>avaje-inject-maven-plugin</artifactId>

inject-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>10.6-SNAPSHOT</version>
+    <version>10.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>avaje-inject-test</artifactId>

inject/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>10.6-SNAPSHOT</version>
+    <version>10.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>avaje-inject</artifactId>

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.avaje</groupId>
   <artifactId>avaje-inject-parent</artifactId>
-  <version>10.6-SNAPSHOT</version>
+  <version>10.7-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>avaje inject parent</name>
   <description>parent pom for avaje inject library</description>
@@ -22,7 +22,7 @@
     <nexus.staging.autoReleaseAfterClose>true</nexus.staging.autoReleaseAfterClose>
     <surefire.useModulePath>false</surefire.useModulePath>
     <argLine>-Dnet.bytebuddy.experimental=true</argLine>
-    <project.build.outputTimestamp>2024-11-10T19:30:37Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-11-20T06:16:02Z</project.build.outputTimestamp>
     <!-- VALHALLA-START ___
     <maven.compiler.release>23</maven.compiler.release>
     <maven.compiler.enablePreview>true</maven.compiler.enablePreview>