feat: update to Java 21

Builds everything and the main tests pass. The annotations have moved packages to avoid collision with the Sponge API module.
SpongePowered · Sep 29, 2024 · b3e9ff6 · b3e9ff6
1 parent fe3ec69
commit b3e9ff6
Show file tree

Hide file tree

Showing 32 changed files with 107 additions and 102 deletions.
diff --git a/annotations/build.gradle b/annotations/build.gradle
diff --git a/annotations/src/main/java/module-info.java b/annotations/src/main/java/module-info.java
@@ -0,0 +1,4 @@
+module org.spongepowered.eventgen.annotations {
+    exports org.spongepowered.eventgen.annotations;
+    exports org.spongepowered.eventgen.annotations.internal;
+}
diff --git a/...tation/eventgen/AbsoluteSortPosition.java → ...gen/annotations/AbsoluteSortPosition.java b/...tation/eventgen/AbsoluteSortPosition.java → ...gen/annotations/AbsoluteSortPosition.java
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.api.util.annotation.eventgen;
+package org.spongepowered.eventgen.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...il/annotation/eventgen/FactoryMethod.java → ...d/eventgen/annotations/FactoryMethod.java b/...il/annotation/eventgen/FactoryMethod.java → ...d/eventgen/annotations/FactoryMethod.java
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.api.util.annotation.eventgen;
+package org.spongepowered.eventgen.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...ation/eventgen/GenerateFactoryMethod.java → ...en/annotations/GenerateFactoryMethod.java b/...ation/eventgen/GenerateFactoryMethod.java → ...en/annotations/GenerateFactoryMethod.java
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.api.util.annotation.eventgen;
+package org.spongepowered.eventgen.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;

diff --git a/...il/annotation/eventgen/ImplementedBy.java → ...d/eventgen/annotations/ImplementedBy.java b/...il/annotation/eventgen/ImplementedBy.java → ...d/eventgen/annotations/ImplementedBy.java
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.api.util.annotation.eventgen;
+package org.spongepowered.eventgen.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;

diff --git a/.../annotation/eventgen/NoFactoryMethod.java → ...eventgen/annotations/NoFactoryMethod.java b/.../annotation/eventgen/NoFactoryMethod.java → ...eventgen/annotations/NoFactoryMethod.java
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.api.util.annotation.eventgen;
+package org.spongepowered.eventgen.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...annotation/eventgen/PropertySettings.java → ...ventgen/annotations/PropertySettings.java b/...annotation/eventgen/PropertySettings.java → ...ventgen/annotations/PropertySettings.java
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.api.util.annotation.eventgen;
+package org.spongepowered.eventgen.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/.../annotation/eventgen/TransformResult.java → ...eventgen/annotations/TransformResult.java b/.../annotation/eventgen/TransformResult.java → ...eventgen/annotations/TransformResult.java
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.api.util.annotation.eventgen;
+package org.spongepowered.eventgen.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...il/annotation/eventgen/TransformWith.java → ...d/eventgen/annotations/TransformWith.java b/...il/annotation/eventgen/TransformWith.java → ...d/eventgen/annotations/TransformWith.java
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.api.util.annotation.eventgen;
+package org.spongepowered.eventgen.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...pi/util/annotation/eventgen/UseField.java → ...owered/eventgen/annotations/UseField.java b/...pi/util/annotation/eventgen/UseField.java → ...owered/eventgen/annotations/UseField.java
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.api.util.annotation.eventgen;
+package org.spongepowered.eventgen.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...ion/eventgen/internal/GeneratedEvent.java → .../annotations/internal/GeneratedEvent.java b/...ion/eventgen/internal/GeneratedEvent.java → .../annotations/internal/GeneratedEvent.java
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.api.util.annotation.eventgen.internal;
+package org.spongepowered.eventgen.annotations.internal;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/annotations/src/main/java9/module-info.java b/annotations/src/main/java9/module-info.java
diff --git a/build.gradle b/build.gradle
@@ -3,6 +3,8 @@ plugins {
     alias(libs.plugins.indra.sonatype) apply false
     alias(libs.plugins.errorprone)
     alias(libs.plugins.eclipseApt)
+    id('java-library')
+    id("org.gradlex.extra-java-module-info") version "1.9"
 }
 
 // Default tasks
@@ -11,16 +13,33 @@ defaultTasks 'spotlessApply', 'build'
 // Basic project information
 group = "org.spongepowered"
 
+extraJavaModuleInfo {
+    deriveAutomaticModuleNamesFromFileNames = true
+    module("com.google.errorprone:javac-shaded", "com.google.errorprone.javac.shaded") {
+        exports("com.google.errorprone.javac.shaded")
+    }
+    module("io.soabase.java-composer:java-composer", "io.soabase.java.composer") {
+        exports("com.squareup.javapoet")
+        requiresTransitive("java.compiler")
+    }
+    module("org.jooq:joor-java-8", "org.jooq.joor") {
+        exports("org.joor")
+    }
+}
+
 allprojects {
     apply plugin: "org.spongepowered.gradle.sponge.dev"
     apply plugin: "net.kyori.indra.publishing"
     apply plugin: "net.ltgt.errorprone"
     apply plugin: "com.diffplug.eclipse.apt"
+    apply plugin: "java-library"
+    apply plugin: "eclipse"
 
     dependencies {
         errorprone libs.errorprone
     }
 
+
     eclipse {
         synchronizationTasks eclipseJdtApt, eclipseJdt, eclipseFactorypath
     }
@@ -51,35 +70,35 @@ allprojects {
             )
         }
     }
+    indra {
+        javaVersions {
+            minimumToolchain(21)
+            target(21)
+        }
+    }
 
     indraSpotlessLicenser {
         property("name", rootProject.projectName)
     }
-}
-
-indra {
-    javaVersions {
-        testWith(8, 11, 17)
+    tasks.withType(JavaCompile).configureEach {
+        options.forkOptions.jvmArgs = [
+                '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005'
+        ]
     }
 }
 
-sourceSets {
-    main {
-        multirelease {
-            moduleName "org.spongepowered.eventimplgen"
-            alternateVersions 9, 13
-        }
-    }
-}
+
 
 // Project dependencies
 dependencies {
     implementation project(":event-impl-gen-annotations")
     api libs.javapoet
+    api libs.javaxInject
+    api libs.jakartaInject
 
     compileOnlyApi libs.errorprone.annotations
 
-    api libs.dagger.runtime
+    api(libs.dagger.runtime)
     annotationProcessor libs.dagger.compiler
 
     compileOnlyApi libs.autoService.annotations

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ version = "1.0"
 [versions]
 autoService = "1.1.1"
 checkerQual = "3.26.0"
-dagger = "2.51.1"
+dagger = "2.52"
 errorprone = "2.28.0"
 junit = "5.10.2"
 
@@ -15,8 +15,10 @@ dagger-runtime = { module = "com.google.dagger:dagger", version.ref = "dagger" }
 dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
 errorprone = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" }
 errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "errorprone" }
-javapoet = { module = "com.squareup:javapoet", version = "1.13.0" }
+javapoet = { module = "io.soabase.java-composer:java-composer", version = "1.0" }
 jetbrainsAnnotations = { module = "org.jetbrains:annotations", version = "24.1.0"}
+jakartaInject = { module = "jakarta.inject:jakarta.inject-api", version = "2.0.1" }
+javaxInject = { module = "javax.inject:javax.inject", version = "1" }
 
 # Tests
 assertj = { module = "org.assertj:assertj-core", version = "3.26.0" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/main/java9/module-info.java → src/main/java/module-info.java b/src/main/java9/module-info.java → src/main/java/module-info.java
@@ -1,14 +1,15 @@
 module org.spongepowered.eventimplgen {
     exports org.spongepowered.eventimplgen.processor;
 
-    requires java.compiler;
-    requires com.squareup.javapoet;
-    // requires transitive dagger;
-    requires transitive org.spongepowered.eventimplgen.annotations;
+    requires dagger;
+    requires javax.inject;
+    requires jakarta.inject;
+    requires io.soabase.java.composer;
+    requires transitive java.compiler;
+    requires transitive org.spongepowered.eventgen.annotations;
 
     requires static transitive com.google.auto.service;
     requires static transitive org.jetbrains.annotations;
-    // requires static transitive javax.inject; TODO maybe?
 
     provides javax.annotation.processing.Processor with org.spongepowered.eventimplgen.processor.EventImplGenProcessor;
 }
diff --git a/src/main/java/org/spongepowered/eventimplgen/eventgencore/PropertySorter.java b/src/main/java/org/spongepowered/eventimplgen/eventgencore/PropertySorter.java
@@ -24,7 +24,7 @@
  */
 package org.spongepowered.eventimplgen.eventgencore;
 
-import org.spongepowered.api.util.annotation.eventgen.AbsoluteSortPosition;
+import org.spongepowered.eventgen.annotations.AbsoluteSortPosition;
 import org.spongepowered.eventimplgen.processor.EventGenOptions;
 
 import java.util.ArrayList;

diff --git a/src/main/java/org/spongepowered/eventimplgen/factory/ClassContext.java b/src/main/java/org/spongepowered/eventimplgen/factory/ClassContext.java
@@ -33,7 +33,7 @@
 import dagger.assisted.Assisted;
 import dagger.assisted.AssistedFactory;
 import dagger.assisted.AssistedInject;
-import org.spongepowered.api.util.annotation.eventgen.UseField;
+import org.spongepowered.eventgen.annotations.UseField;
 import org.spongepowered.eventimplgen.eventgencore.Property;
 
 import java.util.Optional;

diff --git a/src/main/java/org/spongepowered/eventimplgen/factory/ClassGenerator.java b/src/main/java/org/spongepowered/eventimplgen/factory/ClassGenerator.java
@@ -34,14 +34,13 @@
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.TypeVariableName;
 import org.jetbrains.annotations.Nullable;
-import org.spongepowered.api.util.annotation.eventgen.PropertySettings;
-import org.spongepowered.api.util.annotation.eventgen.UseField;
-import org.spongepowered.api.util.annotation.eventgen.internal.GeneratedEvent;
+import org.spongepowered.eventgen.annotations.PropertySettings;
+import org.spongepowered.eventgen.annotations.UseField;
+import org.spongepowered.eventgen.annotations.internal.GeneratedEvent;
 import org.spongepowered.eventimplgen.eventgencore.Property;
 import org.spongepowered.eventimplgen.eventgencore.PropertySorter;
 import org.spongepowered.eventimplgen.factory.plugin.EventFactoryPlugin;
 import org.spongepowered.eventimplgen.processor.EventImplGenProcessor;
-import org.spongepowered.eventimplgen.signature.Descriptors;
 
 import java.util.List;
 import java.util.Objects;

diff --git a/src/main/java/org/spongepowered/eventimplgen/factory/FactoryInterfaceGenerator.java b/src/main/java/org/spongepowered/eventimplgen/factory/FactoryInterfaceGenerator.java
@@ -31,7 +31,7 @@
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.TypeVariableName;
-import org.spongepowered.api.util.annotation.eventgen.internal.GeneratedEvent;
+import org.spongepowered.eventgen.annotations.internal.GeneratedEvent;
 import org.spongepowered.eventimplgen.eventgencore.Property;
 import org.spongepowered.eventimplgen.eventgencore.PropertySorter;
 

diff --git a/...ava/org/spongepowered/eventimplgen/factory/plugin/AccessorModifierEventFactoryPlugin.java b/...ava/org/spongepowered/eventimplgen/factory/plugin/AccessorModifierEventFactoryPlugin.java
@@ -26,8 +26,8 @@
 
 import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.TypeName;
-import org.spongepowered.api.util.annotation.eventgen.TransformResult;
-import org.spongepowered.api.util.annotation.eventgen.TransformWith;
+import org.spongepowered.eventgen.annotations.TransformResult;
+import org.spongepowered.eventgen.annotations.TransformWith;
 import org.spongepowered.eventimplgen.eventgencore.Property;
 import org.spongepowered.eventimplgen.factory.ClassContext;
 

diff --git a/src/main/java/org/spongepowered/eventimplgen/processor/EventGenOptions.java b/src/main/java/org/spongepowered/eventimplgen/processor/EventGenOptions.java
@@ -25,8 +25,8 @@
 package org.spongepowered.eventimplgen.processor;
 
 import org.jetbrains.annotations.Nullable;
-import org.spongepowered.api.util.annotation.eventgen.GenerateFactoryMethod;
-import org.spongepowered.api.util.annotation.eventgen.NoFactoryMethod;
+import org.spongepowered.eventgen.annotations.GenerateFactoryMethod;
+import org.spongepowered.eventgen.annotations.NoFactoryMethod;
 
 import java.util.Arrays;
 import java.util.Collections;

diff --git a/src/main/java/org/spongepowered/eventimplgen/processor/EventImplGenProcessor.java b/src/main/java/org/spongepowered/eventimplgen/processor/EventImplGenProcessor.java
@@ -25,7 +25,7 @@
 package org.spongepowered.eventimplgen.processor;
 
 import com.google.auto.service.AutoService;
-import org.spongepowered.api.util.annotation.eventgen.internal.GeneratedEvent;
+import org.spongepowered.eventgen.annotations.internal.GeneratedEvent;
 
 import java.io.IOException;
 import java.util.HashSet;

diff --git a/src/main/java/org/spongepowered/eventimplgen/processor/EventImplWriter.java b/src/main/java/org/spongepowered/eventimplgen/processor/EventImplWriter.java
@@ -27,7 +27,7 @@
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.JavaFile;
 import org.jetbrains.annotations.Nullable;
-import org.spongepowered.api.util.annotation.eventgen.ImplementedBy;
+import org.spongepowered.eventgen.annotations.ImplementedBy;
 import org.spongepowered.eventimplgen.AnnotationUtils;
 import org.spongepowered.eventimplgen.eventgencore.Property;
 import org.spongepowered.eventimplgen.eventgencore.PropertySorter;