Update to Gradle 9.2.1 and Java 25 (#201)

Yeregorix · web-flow · commit caa6ca49e4ea · 2025-12-19T11:01:14.000Z
* Update to Gradle 9.2.1 and Java 25

* Use new Java features
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -44,8 +44,7 @@ subprojects {
         mitLicense()
 
         javaVersions {
-            target(11)
-            testWith(11, 17, 21)
+            target(25)
         }
 
         configurePublications {
@@ -114,13 +113,7 @@ subprojects {
         }
 
         withType(JavaCompile::class).configureEach {
-            options.compilerArgs.add("-Xlint:-processing")
-
-            doFirst {
-                if (javaCompiler.get().metadata.languageVersion >= JavaLanguageVersion.of(21)) {
-                    options.compilerArgs.add("-Xlint:-this-escape")
-                }
-            }
+            options.compilerArgs.addAll(listOf("-Xlint:-processing", "-Xlint:-this-escape"))
         }
     }
 }
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.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/subprojects/downloader-jdk-http/src/main/java/org/spongepowered/gradle/vanilla/resolver/jdk11/ValidatingBodySubscriber.java b/subprojects/downloader-jdk-http/src/main/java/org/spongepowered/gradle/vanilla/resolver/jdk11/ValidatingBodySubscriber.java
@@ -60,8 +60,7 @@ public void onSubscribe(final Flow.Subscription subscription) {
 
     @Override
     public void onNext(final List<ByteBuffer> item) {
-        for (int i = 0, size = item.size(); i < size; i++) {
-            final ByteBuffer buf = item.get(i);
+        for (final ByteBuffer buf : item) {
             final int pos = buf.position();
             this.md.update(buf);
             buf.position(pos);
diff --git a/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/Constants.java b/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/Constants.java
@@ -35,9 +35,7 @@
 import java.nio.file.Paths;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -160,22 +158,22 @@ private Configurations() {
     /**
      * Group IDs of dependencies that should not be added to a server-only environment
      */
-    public static final Set<String> CLIENT_ONLY_DEPENDENCY_GROUPS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+    public static final Set<String> CLIENT_ONLY_DEPENDENCY_GROUPS = Set.of(
             "oshi-project",
             "net.java.dev.jna",
             "com.ibm.icu",
             "net.java.jinput",
             "net.java.jutils",
             "org.lwjgl"
-    )));
+    );
 
     /**
      * Extra dependencies that are injected into the project.
      */
-    public static final Set<GroupArtifactVersion> INJECTED_DEPENDENCIES = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+    public static final Set<GroupArtifactVersion> INJECTED_DEPENDENCIES = Set.of(
         GroupArtifactVersion.of("com.google.code.findbugs", "jsr305", "3.0.2"),
         GroupArtifactVersion.of("org.jetbrains", "annotations", "23.0.0") // 1.18+ only technically
-    )));
+    );
 
     private Constants() {
     }
diff --git a/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/ProvideMinecraftPlugin.java b/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/ProvideMinecraftPlugin.java
@@ -100,7 +100,6 @@ public void apply(final Project target) {
             .create(MinecraftExtension.class, "minecraft", MinecraftExtensionImpl.class, target, minecraftProvider);
 
         final NamedDomainObjectProvider<Configuration> minecraftConfig = target.getConfigurations().register(Constants.Configurations.MINECRAFT, config -> {
-            config.setVisible(false);
             config.setCanBeConsumed(false);
             config.setCanBeResolved(true);
 
@@ -249,7 +248,6 @@ private TaskProvider<DecompileJarTask> createJarDecompile(
     private TaskProvider<DownloadAssetsTask> createAssetsDownload(final MinecraftExtensionImpl minecraft, final Provider<MinecraftProviderService> minecraftProvider, final TaskContainer tasks) {
 
         final NamedDomainObjectProvider<Configuration> natives = this.project.getConfigurations().register(Constants.Configurations.MINECRAFT_NATIVES, config -> {
-            config.setVisible(false);
             config.setCanBeResolved(true);
             config.setCanBeConsumed(false);
             config.setTransitive(false);
diff --git a/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleDeclaration.java b/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleDeclaration.java
@@ -100,7 +100,7 @@ public <T> Builder rule(final Rule<T> rule, final T value) {
         }
 
         public Builder nextEntry() {
-            this.entries.add(new Entry(this.action, Collections.unmodifiableMap(new HashMap<>(this.rules))));
+            this.entries.add(new Entry(this.action, Map.copyOf(this.rules)));
             this.action = RuleAction.ALLOW;
             this.rules.clear();
             return this;
diff --git a/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/MinecraftRepositoryPlugin.java b/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/MinecraftRepositoryPlugin.java
@@ -32,7 +32,6 @@
 import org.gradle.api.Project;
 import org.gradle.api.ProjectEvaluationListener;
 import org.gradle.api.ProjectState;
-import org.gradle.api.Task;
 import org.gradle.api.artifacts.ModuleVersionSelector;
 import org.gradle.api.artifacts.ResolutionStrategy;
 import org.gradle.api.artifacts.ResolvableDependencies;
@@ -96,14 +95,13 @@ public MinecraftRepositoryPlugin(final BuildEventsListenerRegistry registry) {
 
     @Override
     public void apply(final Object target) {
-        if (target instanceof Project) {
-            this.applyToProject((Project) target);
-        } else if (target instanceof Settings) {
-            this.applyToSettings((Settings) target);
-        } else if (target instanceof Gradle) {
-            // no-op marker left by our settings plugin
-        } else {
-            throw new IllegalArgumentException("Expected target to be a Project or Settings, but was a " + target.getClass());
+        switch (target) {
+            case Project project -> this.applyToProject(project);
+            case Settings settings -> this.applyToSettings(settings);
+            case Gradle _ -> {
+                // no-op marker left by our settings plugin
+            }
+            default -> throw new IllegalArgumentException("Expected target to be a Project or Settings, but was a " + target.getClass());
         }
     }
 
@@ -292,12 +290,9 @@ public void beforeEvaluate(final @NotNull Project project) {}
             public void afterEvaluate(final Project project, final ProjectState state) {
                 if (state.getFailure() != null) return;
                 project.getTasks().configureEach(task -> {
-                    task.doLast(new Action<Task>() {
-                        @Override
-                        public void execute(final Task task) {
-                            task.getLogger().info("Dropping VG resolver state on thread '{}' (task doLast action)", Thread.currentThread().getName());
-                            service.get().dropState();
-                        }
+                    task.doLast(t -> {
+                        t.getLogger().info("Dropping VG resolver state on thread '{}' (task doLast action)", Thread.currentThread().getName());
+                        service.get().dropState();
                     });
                 });
             }
diff --git a/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/rule/JoinedProvidesClientAndServerRule.java b/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/rule/JoinedProvidesClientAndServerRule.java
@@ -78,13 +78,10 @@ public static void configureResolution(final CapabilitiesResolution resolution)
 
     private static void selectJoined(final CapabilityResolutionDetails details) {
         final List<ComponentVariantIdentifier> candidates = details.getCandidates();
-        for (int i = 0; i < candidates.size(); i++) {
-            final ComponentVariantIdentifier id = candidates.get(i);
+        for (final ComponentVariantIdentifier id : candidates) {
             // TODO: is this the right logic if the joined artifact is at a lower version than the single-sided artifact?
-            if (id.getId() instanceof ModuleComponentIdentifier
-             && ((ModuleComponentIdentifier) id.getId()).getModule().equals(MinecraftPlatform.JOINED.artifactId())) {
-                details.select(id).because("Selecting joined artifact version "
-                    + ((ModuleComponentIdentifier) id.getId()).getVersion() + " because it contains both client and server");
+            if (id.getId() instanceof ModuleComponentIdentifier moduleId && moduleId.getModule().equals(MinecraftPlatform.JOINED.artifactId())) {
+                details.select(id).because("Selecting joined artifact version " + moduleId.getVersion() + " because it contains both client and server");
             }
         }
     }
diff --git a/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/util/FunctionalUtils.java b/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/util/FunctionalUtils.java
@@ -34,9 +34,10 @@ private FunctionalUtils() {
 
     public static <T> Supplier<T> memoizeSupplier(final Supplier<T> in) {
         Objects.requireNonNull(in, "in");
-        return new Supplier<T>() {
+        return new Supplier<>() {
             private volatile boolean initialized;
             private T value;
+
             @Override
             public T get() {
                 if (!this.initialized) {
diff --git a/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/util/GradleCompat.java b/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/util/GradleCompat.java
diff --git a/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/util/SelfPreferringClassLoader.java b/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/util/SelfPreferringClassLoader.java
@@ -82,7 +82,7 @@ protected Class<?> loadClass(final String name, final boolean resolve) throws Cl
 
     @Override
     public Enumeration<URL> getResources(final String name) throws IOException {
-        return new Enumeration<URL>() {
+        return new Enumeration<>() {
 
             @Nullable Enumeration<URL> active = SelfPreferringClassLoader.this.findResources(name);
             @Nullable Enumeration<URL> staged = SelfPreferringClassLoader.this.parent == null
diff --git a/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/runs/ManifestDerivedArgumentProvider.java b/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/runs/ManifestDerivedArgumentProvider.java
@@ -60,7 +60,7 @@ final class ManifestDerivedArgumentProvider implements CommandLineArgumentProvid
     @Override
     public Iterable<String> asArguments() {
         final List<String> outputArgs = new ArrayList<>();
-        final StringBuffer builder = new StringBuffer();
+        final StringBuilder builder = new StringBuilder();
         for (final Argument arg : this.arguments.get()) {
             if (arg.rules().test(this.rules)) {
                 arg: for (final String argument : arg.value()) {
@@ -74,8 +74,8 @@ public Iterable<String> asArguments() {
                         final String value = this.environmentTokens.get().get(matcher.group(1));
                         if (value == null) {
                             // If we are the value to a command line argument and we're not present, delete the previous argument.
-                            if (!outputArgs.isEmpty() && outputArgs.get(outputArgs.size() - 1).startsWith("-")) {
-                                outputArgs.remove(outputArgs.size() - 1);
+                            if (!outputArgs.isEmpty() && outputArgs.getLast().startsWith("-")) {
+                                outputArgs.removeLast();
                             }
                             // Either way, skip this whole argument
                             continue arg;
diff --git a/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/runs/RunConfigurationContainer.java b/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/runs/RunConfigurationContainer.java
@@ -42,13 +42,13 @@
 import org.gradle.api.provider.Provider;
 import org.gradle.api.specs.Spec;
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
+import org.gradle.util.internal.ConfigureUtil;
 import org.spongepowered.gradle.vanilla.internal.MinecraftExtensionImpl;
 import org.spongepowered.gradle.vanilla.internal.model.Argument;
 import org.spongepowered.gradle.vanilla.internal.model.Arguments;
 import org.spongepowered.gradle.vanilla.internal.model.JavaRuntimeVersion;
 import org.spongepowered.gradle.vanilla.internal.model.VersionDescriptor;
 import org.spongepowered.gradle.vanilla.internal.model.rule.RuleContext;
-import org.spongepowered.gradle.vanilla.internal.util.GradleCompat;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -246,7 +246,7 @@ public RunConfiguration create(final String name, final Action<? super RunConfig
     @Override
     @SuppressWarnings("rawtypes")
     public NamedDomainObjectContainer<RunConfiguration> configure(final Closure configureClosure) {
-        return GradleCompat.configureSelf(this, configureClosure);
+        return ConfigureUtil.configureSelf(configureClosure, this, new NamedDomainObjectContainerConfigureDelegate(configureClosure, this));
     }
 
     @Override
diff --git a/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/task/DecompileJarTask.java b/subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/task/DecompileJarTask.java
@@ -146,13 +146,12 @@ public void execute() {
                 flags,
                 (env, output) -> {
                     final long totalSystemMemoryBytes =
-                        ((OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean()).getTotalPhysicalMemorySize() / (1024L * 1024L);
+                        ((OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean()).getTotalMemorySize() / (1024L * 1024L);
                     return CompletableFuture.runAsync(() -> {
                         // Determine which parts of the configuration are MC, and which are its dependencies
                         final Set<File> dependencies = new HashSet<>();
                         for (final ResolvedArtifactResult artifact : this.getInputArtifacts().get()) {
-                            if (artifact.getId() instanceof ModuleComponentArtifactIdentifier) {
-                                final ModuleComponentArtifactIdentifier id = (ModuleComponentArtifactIdentifier) artifact.getId();
+                            if (artifact.getId() instanceof ModuleComponentArtifactIdentifier id) {
                                 if (id.getComponentIdentifier().getGroup().equals(MinecraftPlatform.GROUP)) {
                                     if (env.decoratedArtifactId().equals(id.getComponentIdentifier().getModule())) {
                                         continue;
diff --git a/subprojects/gradle-plugin/src/shadow/java/org/spongepowered/gradle/vanilla/internal/ShadowConfigurationApplier.java b/subprojects/gradle-plugin/src/shadow/java/org/spongepowered/gradle/vanilla/internal/ShadowConfigurationApplier.java
@@ -46,12 +46,9 @@ public static void actuallyApplyShadowConfiguration(final TaskContainer tasks, f
         // classes referenced within the filter.
         // whoo!
         MinecraftExclusionFilter.class.getName(); // load class
-        tasks.withType(ShadowJar.class).configureEach(new Action<ShadowJar>() {
-            @Override
-            public void execute(final ShadowJar task) {
-                task.getInputs().property("minecraftNames", minecraftNames);
-                task.dependencies(filter -> filter.exclude(new MinecraftExclusionFilter(minecraftNames)));
-            }
+        tasks.withType(ShadowJar.class).configureEach(task -> {
+            task.getInputs().property("minecraftNames", minecraftNames);
+            task.dependencies(filter -> filter.exclude(new MinecraftExclusionFilter(minecraftNames)));
         });
     }
 
diff --git a/subprojects/resolver-core/src/main/java/org/spongepowered/gradle/vanilla/internal/resolver/AsyncUtils.java b/subprojects/resolver-core/src/main/java/org/spongepowered/gradle/vanilla/internal/resolver/AsyncUtils.java
@@ -55,8 +55,9 @@ public static <T> CompletableFuture<T> failableFuture(final Callable<T> action,
     }
 
     public static <T> Supplier<T> memoizedSupplier(final Supplier<T> input) {
-        return new Supplier<T>() {
+        return new Supplier<>() {
             private volatile @MonotonicNonNull T value;
+
             @Override
             public T get() {
                 if (this.value == null) {
diff --git a/subprojects/resolver-core/src/main/java/org/spongepowered/gradle/vanilla/resolver/ResolutionResult.java b/subprojects/resolver-core/src/main/java/org/spongepowered/gradle/vanilla/resolver/ResolutionResult.java
@@ -144,11 +144,10 @@ public boolean equals(final @Nullable Object other) {
             return true;
         }
 
-        if (!(other instanceof ResolutionResult<?>)) {
+        if (!(other instanceof ResolutionResult<?> that)) {
             return false;
         }
 
-        final ResolutionResult<?> that = (ResolutionResult<?>) other;
         return Objects.equals(this.result, that.result)
             && this.upToDate == that.upToDate;
     }

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,7 @@ subprojects {`
`44`	`44`	`mitLicense()`
`45`	`45`
`46`	`46`	`javaVersions {`
`47`		`- target(11)`
`48`		`- testWith(11, 17, 21)`
	`47`	`+ target(25)`
`49`	`48`	`}`
`50`	`49`
`51`	`50`	`configurePublications {`
`@@ -114,13 +113,7 @@ subprojects {`
`114`	`113`	`}`
`115`	`114`
`116`	`115`	`withType(JavaCompile::class).configureEach {`
`117`		`- options.compilerArgs.add("-Xlint:-processing")`
`118`		`-`
`119`		`- doFirst {`
`120`		`- if (javaCompiler.get().metadata.languageVersion >= JavaLanguageVersion.of(21)) {`
`121`		`- options.compilerArgs.add("-Xlint:-this-escape")`
`122`		`- }`
`123`		`- }`
	`116`	`+ options.compilerArgs.addAll(listOf("-Xlint:-processing", "-Xlint:-this-escape"))`
`124`	`117`	`}`
`125`	`118`	`}`
`126`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public <T> Builder rule(final Rule<T> rule, final T value) {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`public Builder nextEntry() {`
`103`		`- this.entries.add(new Entry(this.action, Collections.unmodifiableMap(new HashMap<>(this.rules))));`
	`103`	`+ this.entries.add(new Entry(this.action, Map.copyOf(this.rules)));`
`104`	`104`	`this.action = RuleAction.ALLOW;`
`105`	`105`	`this.rules.clear();`
`106`	`106`	`return this;`
Original file line number	Diff line number	Diff line change
`@@ -78,13 +78,10 @@ public static void configureResolution(final CapabilitiesResolution resolution)`
`78`	`78`
`79`	`79`	`private static void selectJoined(final CapabilityResolutionDetails details) {`
`80`	`80`	`final List<ComponentVariantIdentifier> candidates = details.getCandidates();`
`81`		`- for (int i = 0; i < candidates.size(); i++) {`
`82`		`- final ComponentVariantIdentifier id = candidates.get(i);`
	`81`	`+ for (final ComponentVariantIdentifier id : candidates) {`
`83`	`82`	`// TODO: is this the right logic if the joined artifact is at a lower version than the single-sided artifact?`
`84`		`- if (id.getId() instanceof ModuleComponentIdentifier`
`85`		`- && ((ModuleComponentIdentifier) id.getId()).getModule().equals(MinecraftPlatform.JOINED.artifactId())) {`
`86`		`- details.select(id).because("Selecting joined artifact version "`
`87`		`- + ((ModuleComponentIdentifier) id.getId()).getVersion() + " because it contains both client and server");`
	`83`	`+ if (id.getId() instanceof ModuleComponentIdentifier moduleId && moduleId.getModule().equals(MinecraftPlatform.JOINED.artifactId())) {`
	`84`	`+ details.select(id).because("Selecting joined artifact version " + moduleId.getVersion() + " because it contains both client and server");`
`88`	`85`	`}`
`89`	`86`	`}`
`90`	`87`	`}`