Merge pull request #30 from EssentialGG/feature/gradle-9-compatibility

Support Gradle 9

Author: Johni0702

build-logic/build.gradle.kts

@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    api("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
+    api("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:8.3.9")
 
     implementation("org.ow2.asm:asm-commons:9.3")
 }

build-logic/src/main/kotlin/essential/configureModLauncherContainerJar.kt

@@ -2,10 +2,13 @@ package essential
 
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.api.artifacts.Configuration
+import org.gradle.api.file.ArchiveOperations
+import org.gradle.kotlin.dsl.support.serviceOf
 
 fun ShadowJar.configureModLauncherContainerJar(configuration: Configuration) {
     dependsOn(configuration)
-    from({ project.zipTree(configuration.singleFile) })
+    val archiveOps = project.serviceOf<ArchiveOperations>()
+    from({ archiveOps.zipTree(configuration.singleFile) })
     preserveJars()
 
     // We cannot relocate the whole package cause the stage1.jar must remain in the same place

build-logic/src/main/kotlin/essential/shadowWithInnerJars.kt

@@ -4,8 +4,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
 import org.gradle.api.file.FileTreeElement
-import shadow.org.apache.tools.zip.ZipEntry
-import shadow.org.apache.tools.zip.ZipOutputStream
+import org.apache.tools.zip.ZipEntry
+import org.apache.tools.zip.ZipOutputStream
 
 /**
  * Shadow by default recursively explodes all jar files.

build.gradle

@@ -4,7 +4,9 @@ subprojects {
     apply plugin: "java"
 
     group = "gg.essential"
-    archivesBaseName = "essential-loader" + path.replace(':', '-')
+    base {
+        archivesName = "essential-loader" + path.replace(':', '-')
+    }
 
     def javaVersions = [
             "compatibility": 16,
@@ -19,18 +21,13 @@ subprojects {
             "modlauncher11": 21,
     ]
     java.toolchain.languageVersion.set(JavaLanguageVersion.of(javaVersions.getOrDefault(project.name, 8)))
-
-    repositories {
-        mavenCentral()
-        maven { url "https://libraries.minecraft.net/" }
-    }
 }
 
 allprojects {
     tasks.withType(AbstractArchiveTask.class).configureEach {
         preserveFileTimestamps = false
         reproducibleFileOrder = true
-        dirMode = 0755
-        fileMode = 0644
+        dirPermissions { unix("755") }
+        filePermissions { unix("644") }
     }
 }

container/fabric/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
 }
 
 val jar by tasks.registering(Jar::class) {
-    destinationDirectory.set(project.buildDir.resolve("libs"))
+    destinationDirectory.set(layout.buildDirectory.dir("libs"))
     archiveBaseName.set("container-${project.name}")
 
     dependsOn(stage0)

container/launchwrapper/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
 }
 
 val jar by tasks.registering(Jar::class) {
-    destinationDirectory.set(project.buildDir.resolve("libs"))
+    destinationDirectory.set(layout.buildDirectory.dir("libs"))
     archiveBaseName.set("container-${project.name}")
 
     dependsOn(stage0)

container/modlauncher8/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
 }
 
 val jar by tasks.registering(ShadowJar::class) {
-    destinationDirectory.set(project.buildDir.resolve("libs"))
+    destinationDirectory.set(layout.buildDirectory.dir("libs"))
     archiveBaseName.set("container-${project.name}")
 
     configureModLauncherContainerJar(stage0)

container/modlauncher9/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
 }
 
 val jar by tasks.registering(ShadowJar::class) {
-    destinationDirectory.set(project.buildDir.resolve("libs"))
+    destinationDirectory.set(layout.buildDirectory.dir("libs"))
     archiveBaseName.set("container-${project.name}")
 
     configureModLauncherContainerJar(stage0)

integrationTest/common/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'java-library'
 
 dependencies {
     api("org.junit.jupiter:junit-jupiter:5.7.2")
+    runtimeOnly("org.junit.platform:junit-platform-launcher")
 
     implementation("org.ow2.asm:asm-commons:5.0")
     implementation("com.google.guava:guava:21.0")

integrationTest/fabric/build.gradle

@@ -1,9 +1,13 @@
 import java.util.function.Supplier
+import javax.inject.Inject
 
-repositories {
-    maven { url "https://maven.fabricmc.net/" }
+interface Injected {
+    @Inject ArchiveOperations getArchiveOps()
 }
 
+def injected = objects.newInstance(Injected.class)
+def archiveOps = injected.getArchiveOps()
+
 sourceSets {
     exampleMod
     essential
@@ -151,15 +155,15 @@ tasks.register("essentialJijijJar", Jar) {
 (1..5).each { i ->
     def stage2Task = tasks.register("stage2V${i}Jar", Jar) {
         archiveBaseName.set(name)
-        from(evaluationDependsOn(':stage2:fabric').tasks.jar.archiveFile.map { zipTree(it) })
+        from(evaluationDependsOn(':stage2:fabric').tasks.jar.archiveFile.map { archiveOps.zipTree(it) })
         // Dummy attribute so they all have different hashes
         manifest {
             attributes "Implementation-Version": "$i"
         }
     }
     def stage3Task = tasks.register("stage3V${i}Jar", Jar) {
         archiveBaseName.set(name)
-        from(tasks.essentialJar.archiveFile.map { zipTree(it) })
+        from(tasks.essentialJar.archiveFile.map { archiveOps.zipTree(it) })
         manifest {
             // Dummy attribute so they all have different hashes
             attributes "Implementation-Version": "$i"
@@ -171,7 +175,7 @@ tasks.register("essentialJijijJar", Jar) {
     }
     tasks.register("exampleBundledModJar$i", Jar) {
         archiveBaseName.set(name)
-        from(tasks.exampleModJar.archiveFile.map { zipTree(it) })
+        from(tasks.exampleModJar.archiveFile.map { archiveOps.zipTree(it) })
 
         def stage2Jar = stage2Task.get().archiveFile
         def stage3Jar = stage3Task.get().archiveFile