Update to Gradle 8.4

Also make everything compatible with the configuration cache. A bit
pointless for a project this small, but worth doing anyway.

build-tools/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 java {
 	toolchain {
-		languageVersion.set(JavaLanguageVersion.of(17))
+		languageVersion = JavaLanguageVersion.of(17)
 	}
 }
 

build.gradle.kts

@@ -1,15 +1,14 @@
 plugins {
 	java
 	`maven-publish`
-	id("com.github.hierynomus.license") version "0.16.1"
 }
 
 group = "org.squiddev"
 version = "0.7.3"
 
 java {
 	toolchain {
-		languageVersion.set(JavaLanguageVersion.of(17))
+		languageVersion = JavaLanguageVersion.of(17)
 	}
 
 	withSourcesJar()
@@ -53,10 +52,8 @@ fun configureChecker(sourceSet: SourceSet, arguments: () -> List<String>) {
 
 	tasks.named(sourceSet.compileJavaTaskName, JavaCompile::class) {
 		options.isFork = true
-		options.compilerArgumentProviders.add {
-			arguments()
-		}
-		options.forkOptions.jvmArgumentProviders.add {
+		options.compilerArgs.addAll(arguments())
+		options.forkOptions.jvmArgs!!.addAll(
 			listOf(
 				"--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
 				"--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
@@ -67,8 +64,8 @@ fun configureChecker(sourceSet: SourceSet, arguments: () -> List<String>) {
 				"--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
 				"--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
 				"--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
-			)
-		}
+			),
+		)
 	}
 }
 
@@ -83,32 +80,26 @@ val javaClassesDir = mainSource.java.classesDirectory.get()
 val untransformedClasses = project.layout.buildDirectory.dir("classes/uninstrumentedJava/main")
 
 val instrumentJava = tasks.register(mainSource.getTaskName("Instrument", "Java"), JavaExec::class) {
-	dependsOn(tasks.compileJava)
+	dependsOn(tasks.compileJava, "cleanInstrumentJava")
 	inputs.dir(untransformedClasses).withPropertyName("inputDir")
 	outputs.dir(javaClassesDir).withPropertyName("outputDir")
 
-	javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
-	mainClass.set("cc.tweaked.cobalt.build.MainKt")
+	javaLauncher = javaToolchains.launcherFor(java.toolchain)
+	mainClass = "cc.tweaked.cobalt.build.MainKt"
 	classpath = buildTools
 
 	args = listOf(
 		untransformedClasses.get().asFile.absolutePath,
 		javaClassesDir.asFile.absolutePath,
 	)
-
-	doFirst { project.delete(javaClassesDir) }
 }
 
 mainSource.compiledBy(instrumentJava)
 tasks.compileJava {
-	destinationDirectory.set(untransformedClasses)
+	destinationDirectory = untransformedClasses
 	finalizedBy(instrumentJava)
 }
 
-license {
-	include("*.java")
-}
-
 tasks.jar {
 	from(sourceSets["doubles"].output)
 }
@@ -119,23 +110,23 @@ publishing {
 			from(components["java"])
 
 			pom {
-				name.set("Cobalt")
-				description.set("A reentrant fork of LuaJ for Lua 5.1")
-				url.set("https://github.com/SquidDev/Cobalt")
+				name = "Cobalt"
+				description = "A reentrant fork of LuaJ for Lua 5.1"
+				url = "https://github.com/SquidDev/Cobalt"
 
 				scm {
-					url.set("https://github.com/SquidDev/Cobalt.git")
+					url = "https://github.com/SquidDev/Cobalt.git"
 				}
 
 				issueManagement {
-					system.set("github")
-					url.set("https://github.com/SquidDev/Cobalt/issues")
+					system = "github"
+					url = "https://github.com/SquidDev/Cobalt/issues"
 				}
 
 				licenses {
 					license {
-						name.set("MIT")
-						url.set("https://github.com/SquidDev/Cobalt/blob/master/LICENSE")
+						name = "MIT"
+						url = "https://github.com/SquidDev/Cobalt/blob/master/LICENSE"
 					}
 				}
 			}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \