Update to Gradle 8.8 (#1125)

src/main/java/net/fabricmc/loom/extension/LoomProblemReporter.java

@@ -40,7 +40,7 @@ public abstract class LoomProblemReporter {
 
 	public void reportSelfResolvingDependencyUsage() {
 		problemReporter.reporting(spec -> spec
-				.label("SelfResolvingDependency is deprecated")
+				.id("loom-deprecated-selfresolvingdependency", "SelfResolvingDependency is deprecated")
 				.details("SelfResolvingDependency has been deprecated for removal in Gradle 9")
 				.solution("Please replace usages of SelfResolvingDependency")
 				.documentedAt("https://github.com/gradle/gradle/pull/27420")

src/main/java/net/fabricmc/loom/util/gradle/WorkerDaemonClientsManagerHelper.java

@@ -59,8 +59,13 @@ public class WorkerDaemonClientsManagerHelper {
 			return Collections.emptyList();
 		};
 
-		//noinspection unchecked
-		manager.selectIdleClientsToStop((Transformer) transformer);
+		try {
+			Method selectIdleClientsToStop = manager.getClass().getDeclaredMethod("selectIdleClientsToStop", Transformer.class);
+			selectIdleClientsToStop.setAccessible(true);
+			selectIdleClientsToStop.invoke(manager, transformer);
+		} catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
+			throw new RuntimeException("Failed to selectIdleClientsToStop", e);
+		}
 
 		return stopped.get();
 	}

src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy

@@ -44,7 +44,7 @@ class FabricAPITest extends Specification implements GradleProjectTestTrait {
 		setup:
 		def gradle = gradleProject(
 				repo: "https://github.com/FabricMC/fabric.git",
-				commit: "efa5891941a32589207dc58c2e77183d599465b8",
+				commit: "41bc64cd617f03d49ecc4a4f7788cb65d465415c",
 				version: version,
 				patch: "fabric_api"
 				)
@@ -60,7 +60,7 @@ class FabricAPITest extends Specification implements GradleProjectTestTrait {
 				""".stripIndent()
 		}
 
-		def minecraftVersion = "23w51b"
+		def minecraftVersion = "1.21"
 		def server = ServerRunner.create(gradle.projectDir, minecraftVersion)
 				.withMod(gradle.getOutputFile("fabric-api-999.0.0.jar"))
 

src/test/groovy/net/fabricmc/loom/test/integration/buildSrc/stopDaemon/TestPlugin.groovy

@@ -28,7 +28,6 @@ import java.nio.file.Path
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.TimeUnit
 
-import org.gradle.api.JavaVersion
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.cache.FileLockManager
@@ -39,6 +38,7 @@ import org.gradle.internal.nativeintegration.services.NativeServices
 import org.gradle.internal.remote.internal.inet.InetAddressFactory
 import org.gradle.internal.service.ServiceRegistry
 import org.gradle.invocation.DefaultGradle
+import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.launcher.daemon.configuration.DaemonParameters
 import org.gradle.launcher.daemon.context.DefaultDaemonContext
 import org.gradle.launcher.daemon.protocol.DaemonMessageSerializer
@@ -109,7 +109,7 @@ class TestPlugin implements Plugin<Project> {
 			return new DefaultDaemonContext(
 					UUID.randomUUID().toString(),
 					new File("."),
-					JavaVersion.current(),
+					JavaLanguageVersion.current(),
 					new File("."),
 					ProcessHandle.current().pid(),
 					0,

src/test/groovy/net/fabricmc/loom/test/util/GradleProjectTestTrait.groovy

@@ -29,6 +29,7 @@ import groovy.transform.Immutable
 import org.apache.commons.io.FileUtils
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
+import org.gradle.util.GradleVersion
 import spock.lang.Shared
 
 import net.fabricmc.loom.test.LoomTestConstants
@@ -201,7 +202,8 @@ trait GradleProjectTestTrait {
 					.withPluginClasspath()
 					.withGradleVersion(gradleVersion)
 					.forwardOutput()
-					.withDebug(enableDebugging)
+					// Only enable debugging when the current gradle version matches the version we are testing
+					.withDebug(enableDebugging && gradleVersion == GradleVersion.current().getVersion())
 		}
 
 		File getProjectDir() {

src/test/resources/patches/fabric_api.patch

@@ -1,6 +1,6 @@
 diff --git a/build.gradle b/build.gradle
---- a/build.gradle	(revision 23e8616e7457d7d4a65119b93952d134607ffc5c)
-+++ b/build.gradle	(date 1699535194191)
+--- a/build.gradle	(revision 41bc64cd617f03d49ecc4a4f7788cb65d465415c)
++++ b/build.gradle	(date 1718312645477)
 @@ -13,7 +13,7 @@
 
  def ENV = System.getenv()
@@ -9,8 +9,8 @@ diff --git a/build.gradle b/build.gradle
 +version = "999.0.0"
  logger.lifecycle("Building Fabric: " + version)
 
-
-@@ -22,24 +22,7 @@
+ def metaProjects = [
+@@ -34,24 +34,7 @@
  import org.apache.commons.codec.digest.DigestUtils
 
  def getSubprojectVersion(project) {

src/test/resources/projects/dependencyResolutionManagement/basic/gradle.properties

@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.5
-	yarn_mappings=1.16.5+build.6
-	loader_version=0.11.3
+	minecraft_version=1.20.4
+	yarn_mappings=1.20.4+build.3
+	loader_version=0.15.11
 
 # Mod Properties
 	mod_version = 1.0.0

src/test/resources/projects/dependencyResolutionManagement/projmap/gradle.properties

@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.5
-	yarn_mappings=1.16.5+build.6
-	loader_version=0.11.3
+	minecraft_version=1.20.4
+	yarn_mappings=1.20.4+build.3
+	loader_version=0.15.11
 
 # Mod Properties
 	mod_version = 1.0.0

src/test/resources/projects/runconfigs/build.gradle

@@ -44,7 +44,7 @@ version = "1.0.0"
 dependencies {
 	minecraft "com.mojang:minecraft:1.18.1"
 	mappings "net.fabricmc:yarn:1.18.1+build.12:v2"
-	modImplementation "net.fabricmc:fabric-loader:0.12.12"
+	modImplementation "net.fabricmc:fabric-loader:0.15.11"
 }
 
 base {