Merge pull request #181 from embeddedt/lts-gradle-9

wagyourtail · web-flow · commit 9140c374d1db · 2025-12-24T15:48:04.000-06:00
[1.3] Update to Gradle 8.14.3 + address Gradle 9 deprecations
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/patch/bukkit/CraftbukkitPatcher.kt b/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/patch/bukkit/CraftbukkitPatcher.kt
@@ -13,6 +13,6 @@ interface CraftbukkitPatcher : MinecraftPatcher {
         this.loader = version
     }
 
-    var classPathPluginLoader: Configuration?
+    var classPathPluginLoader: Configuration
     fun agentVersion(vers: String)
 }
diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/task/RemapJarTask.kt b/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/task/RemapJarTask.kt
@@ -15,7 +15,7 @@ interface RemapJarTask : JarInterface<AbstractRemapJarTask>, RemapOptions {
      */
     @get:Input
     @get:Optional
-    val remapATToLegacy: Property<Boolean?>
+    val remapATToLegacy: Property<Boolean>
 
     fun mixinRemap(action: MixinRemapOptions.() -> Unit)
 
diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/util/Utils.kt b/src/api/kotlin/xyz/wagyourtail/unimined/util/Utils.kt
@@ -20,6 +20,7 @@ import org.gradle.api.logging.configuration.ShowStacktrace
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.configurationcache.extensions.capitalized
+import org.gradle.process.ExecOperations
 import org.gradle.process.JavaExecSpec
 import xyz.wagyourtail.unimined.api.unimined
 import java.io.File
@@ -31,6 +32,7 @@ import java.nio.file.attribute.BasicFileAttributes
 import java.security.MessageDigest
 import java.util.*
 import java.util.zip.ZipOutputStream
+import javax.inject.Inject
 import kotlin.io.path.*
 import kotlin.math.pow
 import kotlin.reflect.KClass
@@ -531,6 +533,16 @@ fun Project.shouldShowVerboseStderr(): Boolean {
     return shouldShowVerboseStdout() || gradle.startParameter.showStacktrace != ShowStacktrace.INTERNAL_EXCEPTIONS
 }
 
+interface InjectedExecOps {
+    @get:Inject
+    val execOps: ExecOperations
+}
+
+val Project.execOps: ExecOperations
+    get() {
+        return project.objects.newInstance(InjectedExecOps::class.java).execOps
+    }
+
 fun Project.suppressLogs(spec: JavaExecSpec) {
     if (shouldShowVerboseStdout()) {
         spec.standardOutput = System.out
diff --git a/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/MappingsProvider.kt b/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/MappingsProvider.kt
@@ -289,7 +289,7 @@ class MappingsProvider(project: Project, minecraft: MinecraftConfig, val mapping
         }
         val output = Files.createTempFile("yarnv1+${build}+filled", ".tiny")
 
-        project.javaexec {
+        project.execOps.javaexec {
             it.classpath = project.configurations.detachedConfiguration(
                 project.dependencies.create(
                     "net.fabricmc:stitch:0.6.2"
diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/access/transformer/AccessTransformerMinecraftTransformer.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/access/transformer/AccessTransformerMinecraftTransformer.kt
@@ -15,6 +15,7 @@ import xyz.wagyourtail.unimined.internal.minecraft.patch.AbstractMinecraftTransf
 import xyz.wagyourtail.unimined.api.minecraft.MinecraftJar
 import xyz.wagyourtail.unimined.internal.minecraft.patch.access.AccessConvertImpl
 import xyz.wagyourtail.unimined.util.FinalizeOnRead
+import xyz.wagyourtail.unimined.util.execOps
 import xyz.wagyourtail.unimined.util.getShortSha1
 import xyz.wagyourtail.unimined.util.openZipFileSystem
 import xyz.wagyourtail.unimined.util.suppressLogs
@@ -136,7 +137,7 @@ interface AccessTransformerMinecraftTransformer : AccessTransformerPatcher, Acce
             }
         }
         try {
-            project.javaexec { spec ->
+            project.execOps.javaexec { spec ->
                 val toolchain = project.extensions.getByType(JavaToolchainService::class.java)
                 spec.executable = toolchain.launcherFor {
                     it.languageVersion.set(JavaLanguageVersion.of(provider.minecraftData.metadata.javaVersion.majorVersion))
diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/bukkit/buildtools/BuildToolsExecutor.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/bukkit/buildtools/BuildToolsExecutor.kt
@@ -6,6 +6,7 @@ import org.gradle.api.Project
 import xyz.wagyourtail.unimined.api.unimined
 import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider
 import xyz.wagyourtail.unimined.util.cachingDownload
+import xyz.wagyourtail.unimined.util.execOps
 import java.net.URI
 import java.nio.file.Path
 import javax.xml.parsers.DocumentBuilderFactory
@@ -143,7 +144,7 @@ class BuildToolsExecutor(
 
         if (!targetFile.exists() || project.unimined.forceReload) {
             project.logger.lifecycle("[Unimined/BuildTools] running build tools")
-            project.javaexec {
+            project.execOps.javaexec {
                 it.classpath(project.files(buildTools))
                 it.mainClass.set("org.spigotmc.builder.Bootstrap")
                 it.args("--compile", target.name.lowercase(), "--dont-update", "--dev")
diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/forge/fg3/mcpconfig/SubprocessExecutor.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/forge/fg3/mcpconfig/SubprocessExecutor.kt
@@ -7,6 +7,7 @@ import org.gradle.api.logging.LogLevel
 import org.gradle.api.logging.configuration.ShowStacktrace
 import org.gradle.process.ExecResult
 import org.gradle.process.JavaExecSpec
+import xyz.wagyourtail.unimined.util.execOps
 
 object SubprocessExecutor {
     fun shouldShowVerboseStdout(project: Project): Boolean {
@@ -27,7 +28,7 @@ object SubprocessExecutor {
      * @return the execution result
      */
     fun exec(project: Project, configurator: Action<in JavaExecSpec>): ExecResult {
-        return project.javaexec { spec: JavaExecSpec ->
+        return project.execOps.javaexec { spec: JavaExecSpec ->
             spec.workingDir(project.rootProject.projectDir)
             configurator.execute(spec)
             if (shouldShowVerboseStdout(project)) {
diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/jarmod/JarModAgentMinecraftTransformer.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/jarmod/JarModAgentMinecraftTransformer.kt
@@ -105,7 +105,11 @@ open class JarModAgentMinecraftTransformer(
             config.jvmArgs("-D${JMA_TRANSFORMERS}=${transforms.joinToString(File.pathSeparator)}")
         }
         // priority classpath
-        val priorityClasspath = provider.detectCombineWithSourceSets().map { it.second.output.classesDirs.toMutableSet().also {set-> it.second.output.resourcesDir.let { set.add(it) } } }.flatten()
+        val priorityClasspath = provider.detectCombineWithSourceSets().map { pair ->
+            pair.second.output.classesDirs.toMutableSet().also { set ->
+                pair.second.output.resourcesDir?.let { set.add(it) }
+            }
+        }.flatten()
         if (priorityClasspath.isNotEmpty()) {
             config.jvmArgs("-D${JMA_PRIORITY_CLASSPATH}=${priorityClasspath.joinToString(File.pathSeparator) { it.absolutePath }}")
         }
diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/merged/MergedMinecraftTransformer.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/merged/MergedMinecraftTransformer.kt
@@ -4,6 +4,7 @@ import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream
 import org.gradle.api.Project
 import org.jetbrains.annotations.ApiStatus
 import org.objectweb.asm.tree.ClassNode
+import xyz.wagyourtail.unimined.api.mapping.MappingNamespaceTree
 import xyz.wagyourtail.unimined.api.minecraft.patch.*
 import xyz.wagyourtail.unimined.api.minecraft.patch.ataw.AccessTransformerPatcher
 import xyz.wagyourtail.unimined.api.minecraft.patch.ataw.AccessWidenerPatcher
@@ -38,6 +39,9 @@ import java.nio.file.Path
 
 class MergedMinecraftTransformer(project: Project, provider: MinecraftProvider): AbstractMinecraftTransformer(project, provider, "merged"), MergedPatcher {
 
+    // Quick hack to make previously impossible val/var conflict in Kotlin 1.x compile
+    override var prodNamespace: MappingNamespaceTree.Namespace = super.prodNamespace
+
     val patchers = mutableListOf<AbstractMinecraftTransformer>()
 
     var customLibraryFilter: ((Library) -> Library?)? by FinalizeOnRead(null)
diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/reindev/FoxLoaderMinecraftTransformer.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/reindev/FoxLoaderMinecraftTransformer.kt
@@ -136,7 +136,7 @@ class FoxLoaderMinecraftTransformer(
         project.logger.info(transformed.path.absolutePathString())
         project.logger.info(newPath.absolutePathString())
 
-        project.javaexec {
+        project.execOps.javaexec {
             it.classpath = foxLoaderInvoker
             it.mainClass.set("com/fox2code/foxloader/invoker/Main")
             it.args(
diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/rift/RiftMinecraftTransformer.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/rift/RiftMinecraftTransformer.kt
@@ -53,7 +53,7 @@ open class RiftMinecraftTransformer(
 
         if (rift == null) rift = project.dependencies.create("org.dimdev:rift:${provider.version}")
 
-        project.configurations.getByName("modImplementation".withSourceSet(provider.sourceSet)).dependencies.add(rift)
+        project.configurations.getByName("modImplementation".withSourceSet(provider.sourceSet)).dependencies.add(rift!!)
 
         super.apply()
     }
diff --git a/src/source/kotlin/xyz/wagyourtail/unimined/internal/source/generator/SourceGeneratorImpl.kt b/src/source/kotlin/xyz/wagyourtail/unimined/internal/source/generator/SourceGeneratorImpl.kt
@@ -62,7 +62,7 @@ class SourceGeneratorImpl(val project: Project, val provider: SourceProvider) :
         }
 
         outputPath.deleteIfExists()
-        project.javaexec { spec ->
+        project.execOps.javaexec { spec ->
 
             val javaVersion = javaVersion
             if (javaVersion != null) {
diff --git a/src/source/kotlin/xyz/wagyourtail/unimined/internal/source/remapper/SourceRemapperImpl.kt b/src/source/kotlin/xyz/wagyourtail/unimined/internal/source/remapper/SourceRemapperImpl.kt
@@ -11,6 +11,7 @@ import xyz.wagyourtail.unimined.api.unimined
 import xyz.wagyourtail.unimined.internal.mapping.MappingsProvider
 import xyz.wagyourtail.unimined.internal.mapping.task.ExportMappingsTaskImpl
 import xyz.wagyourtail.unimined.internal.source.SourceProvider
+import xyz.wagyourtail.unimined.util.execOps
 import xyz.wagyourtail.unimined.util.withSourceSet
 import java.io.File
 import java.nio.file.Path
@@ -132,7 +133,7 @@ class SourceRemapperImpl(val project: Project, val provider: SourceProvider) : S
         }
 
         // run remap
-        project.javaexec { spec ->
+        project.execOps.javaexec { spec ->
             spec.classpath(sourceRemapper)
             spec.mainClass.set("com.replaymod.gradle.remap.MainKt")
             spec.args = listOf(

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ interface CraftbukkitPatcher : MinecraftPatcher {`
`13`	`13`	`this.loader = version`
`14`	`14`	`}`
`15`	`15`
`16`		`- var classPathPluginLoader: Configuration?`
	`16`	`+ var classPathPluginLoader: Configuration`
`17`	`17`	`fun agentVersion(vers: String)`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ class MappingsProvider(project: Project, minecraft: MinecraftConfig, val mapping`
`289`	`289`	`}`
`290`	`290`	`val output = Files.createTempFile("yarnv1+${build}+filled", ".tiny")`
`291`	`291`
`292`		`- project.javaexec {`
	`292`	`+ project.execOps.javaexec {`
`293`	`293`	`it.classpath = project.configurations.detachedConfiguration(`
`294`	`294`	`project.dependencies.create(`
`295`	`295`	`"net.fabricmc:stitch:0.6.2"`