chore(deps): Update build deps and github actions (major) (#107)

* chore(deps): Update build deps and github actions

* chore: Force a minimum of J17 toolchain

* fix: correct JVM version ranges for tests

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: zml <[email protected]>

Author: renovate[bot]

build.gradle.kts

@@ -23,7 +23,7 @@ subprojects {
     apply(plugin = "net.kyori.indra.git")
 
     val indra = extensions.getByType(IndraExtension::class)
-    val testTargets = listOf(11, 17, 21)
+    val testTargets = listOf(11, 17, 21, 25)
     if (project.name != "spongegradle-testlib") {
         plugins.apply(JavaGradlePluginPlugin::class)
         apply(plugin = "com.gradle.plugin-publish")
@@ -90,6 +90,7 @@ subprojects {
         mitLicense()
 
         javaVersions {
+            minimumToolchain(17)
             testWith().addAll(testTargets)
         }
 

gradle.properties

@@ -2,4 +2,6 @@ name=SpongeGradle
 url=https://www.spongepowered.org
 organization=SpongePowered
 projectUrl=https://www.spongepowered.org
-javadocLinkRoot=https://jd.spongepowered.org/spongegradle/
+javadocLinkRoot=https://jd.spongepowered.org/spongegradle/
+
+org.gradle.parallel=true

gradle/libs.versions.toml

@@ -3,8 +3,8 @@ version = "1.0"
 
 [versions]
 indra = "3.2.0"
-pluginPublish = "1.3.1"
-spotless = "7.2.1"
+pluginPublish = "2.0.0"
+spotless = "8.0.0"
 junit = "5.9.3"
 mammoth = "1.5.0"
 

gradle/wrapper/gradle-wrapper.jar

@@ -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.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -28,10 +28,13 @@
 import org.gradle.testfixtures.ProjectBuilder;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 
 public class EmptyBuildTest {
 
     @Test
+    @DisabledForJreRange(max = JRE.JAVA_16)
     void testEmptyBuild() {
         final Project project = ProjectBuilder.builder().build();
         project.getPlugins().apply("org.spongepowered.gradle.plugin");

plugin-development/src/test/java/org/spongepowered/gradle/plugin/EmptyBuildTest.java

@@ -7,7 +7,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 
 dependencyResolutionManagement {

settings.gradle.kts

@@ -42,7 +42,8 @@
 @GradleParameters({"--warning-mode", "fail", "--stacktrace"})
 @TestVariant(gradleVersion = "7.6.4", maximumRuntimeVersion = 20)
 @TestVariant(gradleVersion = "7.6.4", extraArguments = "--configuration-cache", maximumRuntimeVersion = 20)
-@TestVariant(gradleVersion = "8.10", extraArguments = "--configuration-cache", minimumRuntimeVersion = 17)
+@TestVariant(gradleVersion = "8.14.3", extraArguments = "--configuration-cache", minimumRuntimeVersion = 17, maximumRuntimeVersion = 24)
+@TestVariant(gradleVersion = "9.1.0", extraArguments = "--configuration-cache", minimumRuntimeVersion = 17)
 @TestVariantResource(value = "/injected-gradle-versions", optional = true, minimumRuntimeVersion = 17)
 @Documented
 @Retention(RetentionPolicy.RUNTIME)