Build file fixes (#139)

* Add auto-provisioning Downloads JDK 8 if needed for loom * Fix Pack200 error * Improve build files formatting
odtheking · Dec 7, 2024 · 0fec1e7 · 0fec1e7
1 parent fd6a854
commit 0fec1e7
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 37 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,5 @@
+import dev.architectury.pack200.java.Pack200Adapter
+
 plugins {
     idea
     java
@@ -43,13 +45,17 @@ allprojects {
 
         implementation("gg.essential:loader-launchwrapper:1.1.3")
         compileOnly("gg.essential:essential-1.8.9-forge:12132+g6e2bf4dc5")
+    }
 
-        sourceSets.main {
-            java.srcDir(file("$projectDir/src/main/kotlin"))
-            output.setResourcesDir(sourceSets.main.flatMap { it.java.classesDirectory })
-        }
+    loom {
+        forge.pack200Provider.set(Pack200Adapter())
+    }
 
-        java.toolchain.languageVersion.set(JavaLanguageVersion.of(8))
-        kotlin.jvmToolchain(8)
+    sourceSets.main {
+        java.srcDir(file("$projectDir/src/main/kotlin"))
+        output.setResourcesDir(sourceSets.main.flatMap { it.java.classesDirectory })
     }
+
+    java.toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+    kotlin.jvmToolchain(8)
 }
diff --git a/odin/build.gradle.kts b/odin/build.gradle.kts
@@ -1,4 +1,3 @@
-import dev.architectury.pack200.java.Pack200Adapter
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 group = "me.odin"
@@ -21,7 +20,6 @@ loom {
         }
     }
     forge {
-        pack200Provider.set(Pack200Adapter())
         mixinConfig("mixins.odin.json")
     }
     @Suppress("UnstableApiUsage")
@@ -33,7 +31,7 @@ tasks {
         inputs.property("version", version)
 
         filesMatching("mcmod.info") {
-            expand(mapOf("version" to version))
+            expand(inputs.properties)
         }
         dependsOn(compileJava)
     }

diff --git a/odinclient/build.gradle.kts b/odinclient/build.gradle.kts
@@ -1,4 +1,3 @@
-import dev.architectury.pack200.java.Pack200Adapter
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 group = "me.odinclient"
@@ -21,7 +20,6 @@ loom {
         }
     }
     forge {
-        pack200Provider.set(Pack200Adapter())
         mixinConfig("mixins.odinclient.json")
     }
     @Suppress("UnstableApiUsage")
@@ -33,7 +31,7 @@ tasks {
         inputs.property("version", version)
 
         filesMatching("mcmod.info") {
-            expand(mapOf("version" to version))
+            expand(inputs.properties)
         }
         dependsOn(compileJava)
     }
@@ -52,14 +50,14 @@ tasks {
     }
 
     remapJar {
-        archiveBaseName = "OdinClient"
-        input = shadowJar.get().archiveFile
+        archiveBaseName.set("OdinClient")
+        input.set(shadowJar.get().archiveFile)
     }
 
     shadowJar {
         destinationDirectory.set(layout.buildDirectory.dir("archiveJars"))
-        archiveBaseName = "OdinClient"
-        archiveClassifier = "dev"
+        archiveBaseName.set("Odin")
+        archiveClassifier.set("dev")
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         configurations = listOf(shadowImpl)
         mergeServiceFiles()

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,22 +1,26 @@
-pluginManagement {
-    repositories {
-        mavenCentral()
-        gradlePluginPortal()
-        maven("https://oss.sonatype.org/content/repositories/snapshots")
-        maven("https://maven.architectury.dev/")
-        maven("https://maven.fabricmc.net")
-        maven("https://maven.minecraftforge.net/")
-        maven("https://repo.spongepowered.org/maven/")
-        maven("https://repo.sk1er.club/repository/maven-releases/")
-    }
-    resolutionStrategy {
-        eachPlugin {
-            when (requested.id.id) {
-                "gg.essential.loom" -> useModule("gg.essential:architectury-loom:${requested.version}")
-            }
-        }
-    }
-}
-
-rootProject.name = "OdinMod"
+pluginManagement {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+        maven("https://oss.sonatype.org/content/repositories/snapshots")
+        maven("https://maven.architectury.dev/")
+        maven("https://maven.fabricmc.net")
+        maven("https://maven.minecraftforge.net/")
+        maven("https://repo.spongepowered.org/maven/")
+        maven("https://repo.sk1er.club/repository/maven-releases/")
+    }
+    resolutionStrategy {
+        eachPlugin {
+            when (requested.id.id) {
+                "gg.essential.loom" -> useModule("gg.essential:architectury-loom:${requested.version}")
+            }
+        }
+    }
+}
+
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
+}
+
+rootProject.name = "OdinMod"
 include("odinclient", "odin")