Update deploy.gradle

Author: Frotty

de.peeeq.wurstscript/deploy.gradle

@@ -17,24 +17,20 @@ publishing {
     }
 }
 
-// ----------------------- Tool discovery (jdeps/jlink via toolchain) -----------------
+
+def toolJavaHome = {
+    def svc = project.extensions.getByType(JavaToolchainService)
+    def launcher = svc.launcherFor(project.java.toolchain)
+    launcher.get().metadata.installationPath.asFile
+}
+
 def toolExecutable = { String toolName ->
-    File javaHome = null
-    def envHome = System.getenv('JAVA_HOME')
-    if (envHome) {
-        javaHome = new File(envHome)
-    }
-    if (!javaHome?.exists()) {
-        def svc = project.extensions.getByType(JavaToolchainService)
-        def launcher = svc.launcherFor(project.java.toolchain)
-        javaHome = launcher.get().metadata.installationPath.asFile
-    }
+    def javaHome = System.getenv('JAVA_HOME') ? new File(System.getenv('JAVA_HOME')) : toolJavaHome()
     def ext = OperatingSystem.current().isWindows() ? ".exe" : ""
-    def path = new File(javaHome, "bin/${toolName}${ext}").absolutePath
-    logger.lifecycle("[tools] Using ${toolName} at ${path}")
-    return path
+    new File(javaHome, "bin/${toolName}${ext}").absolutePath
 }
 
+
 // ----------------------- Common providers/locations ---------------------------------
 def fatJar = tasks.named('shadowJar').flatMap { it.archiveFile }
 
@@ -90,6 +86,7 @@ tasks.register("jdepsModules") {
     }
 }
 
+// 2) Build slim runtime with jlink (overwrite if exists)
 // 2) Build slim runtime with jlink (overwrite if exists)
 tasks.register("jlinkRuntime25") {
     description = "Builds a slim Java 25 runtime image containing only the needed modules"
@@ -101,28 +98,42 @@ tasks.register("jlinkRuntime25") {
 
     doLast {
         ExecOperations execOps = project.services.get(ExecOperations)
-        def jlink  = toolExecutable("jlink")
-        def mods   = modulesTxt.get().asFile.text.trim()
-        def outDir = jreImageDir.get().asFile
+
+        // Resolve Java home from toolchain (fallback to JAVA_HOME if set)
+        def svc = project.extensions.getByType(JavaToolchainService)
+        def launcher = svc.launcherFor(project.java.toolchain)
+        File javaHome = System.getenv('JAVA_HOME') ? new File(System.getenv('JAVA_HOME')) : launcher.get().metadata.installationPath.asFile
+
+        def jlink    = new File(javaHome, "bin/${OperatingSystem.current().isWindows() ? 'jlink.exe' : 'jlink'}").absolutePath
+        def jmodsDir = new File(javaHome, "jmods").absolutePath
+        def mods     = modulesTxt.get().asFile.text.trim()
+        def outDir   = jreImageDir.get().asFile
 
         if (!mods) throw new GradleException("No modules detected for jlink.")
+
         // jlink requires the output dir to NOT exist
-        if (outDir.exists()) project.delete(outDir)
+        if (outDir.exists()) {
+            project.delete(outDir)
+        }
         outDir.parentFile.mkdirs()
 
         logger.lifecycle("[jlink] Using: ${jlink}")
+        logger.lifecycle("[jlink] JAVA_HOME: ${javaHome}")
+        logger.lifecycle("[jlink] jmods: ${jmodsDir}")
         logger.lifecycle("[jlink] Modules: ${mods}")
 
         def errBuf = new ByteArrayOutputStream()
         def outBuf = new ByteArrayOutputStream()
+
         def result = execOps.exec {
             commandLine jlink,
                     "--verbose",
+                    "--module-path", jmodsDir,      // <— force clean jmods
                     "--add-modules", mods,
                     "--no-header-files",
                     "--no-man-pages",
                     "--strip-debug",
-                    "--compress", "zip-6",
+                    "--compress", "zip-6",          // replaces deprecated "--compress=2"
                     "--output", outDir.absolutePath
             errorOutput = errBuf
             standardOutput = outBuf
@@ -140,6 +151,7 @@ tasks.register("jlinkRuntime25") {
 }
 
 
+
 // 3) Assemble folder layout: jre + compiler.jar (no manifest)
 tasks.register("assembleSlimCompilerDist", Copy) {
     description = "Assembles dist folder with slim JRE and compiler.jar (no manifest)."