Bump Forge Gradle version

build.gradle

@@ -8,7 +8,7 @@
     }
     dependencies {
         classpath 'com.google.code.gson:gson:2.8.1'
-        classpath 'net.minecraftforge.gradle:ForgeGradle:5.0.12'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:5.0.24'
     }
 }
 
@@ -40,14 +40,6 @@
     withJavadocJar()
 }
 
-// Tragically java.toolchain.languageVersion doesn't apply to ForgeGradle's
-// tasks, so we force all launchers to use the right Java version.
-tasks.withType(JavaCompile).configureEach {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = javaVersion
-    }
-}
-
 tasks.withType(JavaExec).configureEach {
     javaLauncher = javaToolchains.launcherFor {
         languageVersion = javaVersion
@@ -305,8 +297,8 @@ task docWebsite(type: Copy, dependsOn: [illuaminateDocs]) {
 jacocoTestReport {
     dependsOn('test')
     reports {
-        xml.enabled true
-        html.enabled true
+        xml.required = true
+        html.required = true
     }
 }
 
@@ -370,14 +362,10 @@ task setupServer(type: Copy) {
     // Copy from runTestServer. We do it in this slightly odd way as runTestServer
     // isn't created until the task is configured (which is no good for us).
     JavaExec exec = tasks.getByName('runTestServer')
-    it.setWorkingDir(exec.getWorkingDir())
-    it.setSystemProperties(exec.getSystemProperties())
-    it.setBootstrapClasspath(exec.getBootstrapClasspath())
+    exec.copyTo(it)
     it.setClasspath(exec.getClasspath())
-    it.setMain(exec.getMain())
-    it.setEnvironment(exec.getEnvironment())
+    it.mainClass = exec.mainClass
     it.setArgs(exec.getArgs())
-    it.setJvmArgs(exec.getJvmArgs())
 
     it.systemProperty('forge.logging.console.level', 'info')
     it.systemProperty('cctest.run', 'true')
@@ -464,6 +452,8 @@ task setupServer(type: Copy) {
         relations {
             incompatible "computercraft"
         }
+
+        addGameVersion "${mc_version}"
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists