Skip to content

Commit 4f53a43

Browse files
committed
Update to Gradle 9.2.1 and Java 25
1 parent c68b58c commit 4f53a43

File tree

4 files changed

+5
-70
lines changed

4 files changed

+5
-70
lines changed

build.gradle.kts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ subprojects {
4444
mitLicense()
4545

4646
javaVersions {
47-
target(11)
48-
testWith(11, 17, 21)
47+
target(25)
4948
}
5049

5150
configurePublications {
@@ -114,13 +113,7 @@ subprojects {
114113
}
115114

116115
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"))
124117
}
125118
}
126119
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/internal/util/GradleCompat.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

subprojects/gradle-plugin/src/main/java/org/spongepowered/gradle/vanilla/runs/RunConfigurationContainer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
import org.gradle.api.provider.Provider;
4343
import org.gradle.api.specs.Spec;
4444
import org.gradle.jvm.toolchain.JavaLanguageVersion;
45+
import org.gradle.util.internal.ConfigureUtil;
4546
import org.spongepowered.gradle.vanilla.internal.MinecraftExtensionImpl;
4647
import org.spongepowered.gradle.vanilla.internal.model.Argument;
4748
import org.spongepowered.gradle.vanilla.internal.model.Arguments;
4849
import org.spongepowered.gradle.vanilla.internal.model.JavaRuntimeVersion;
4950
import org.spongepowered.gradle.vanilla.internal.model.VersionDescriptor;
5051
import org.spongepowered.gradle.vanilla.internal.model.rule.RuleContext;
51-
import org.spongepowered.gradle.vanilla.internal.util.GradleCompat;
5252

5353
import java.util.Arrays;
5454
import java.util.Collection;
@@ -246,7 +246,7 @@ public RunConfiguration create(final String name, final Action<? super RunConfig
246246
@Override
247247
@SuppressWarnings("rawtypes")
248248
public NamedDomainObjectContainer<RunConfiguration> configure(final Closure configureClosure) {
249-
return GradleCompat.configureSelf(this, configureClosure);
249+
return ConfigureUtil.configureSelf(configureClosure, this, new NamedDomainObjectContainerConfigureDelegate(configureClosure, this));
250250
}
251251

252252
@Override

0 commit comments

Comments
 (0)