Fix release build gradle setup (#533)

pkl-cli/pkl-cli.gradle.kts

@@ -109,8 +109,8 @@ val javaExecutable by tasks.registering(ExecutableJar::class) {
 val testJavaExecutable by tasks.registering(Test::class) {
   testClassesDirs = tasks.test.get().testClassesDirs
   classpath =
-      // compiled test classes
+    // compiled test classes
-      sourceSets.test.get().output +
+    sourceSets.test.get().output +
       // java executable
       javaExecutable.get().outputs.files +
       // test-only dependencies
@@ -127,7 +127,8 @@ tasks.check {
 // To catch this and similar problems, test that Java executable starts successfully.
 val testStartJavaExecutable by tasks.registering(Exec::class) {
   dependsOn(javaExecutable)
-  val outputFile = layout.buildDirectory.file("testStartJavaExecutable") // dummy output to satisfy up-to-date check
+  val outputFile =
+    layout.buildDirectory.file("testStartJavaExecutable") // dummy output to satisfy up-to-date check
   outputs.file(outputFile)
 
   if (buildInfo.os.isWindows) {
@@ -186,8 +187,10 @@ fun Exec.configureExecutable(
     .withPropertyName("runtimeClasspath")
     .withNormalizer(ClasspathNormalizer::class)
   val nativeImageCommandName = if (buildInfo.os.isWindows) "native-image.cmd" else "native-image"
-  inputs.files(file(graalVm.baseDir)
+  inputs.files(
-    .resolve("bin/$nativeImageCommandName"))
+    file(graalVm.baseDir)
+      .resolve("bin/$nativeImageCommandName")
+  )
     .withPropertyName("graalVmNativeImage")
     .withPathSensitivity(PathSensitivity.ABSOLUTE)
   outputs.file(outputFile)
@@ -200,43 +203,46 @@ fun Exec.configureExecutable(
   val exclusions = listOf(libs.truffleApi, libs.graalSdk).map { it.get().module.name }
   // https://www.graalvm.org/22.0/reference-manual/native-image/Options/
   argumentProviders.add(CommandLineArgumentProvider {
-    listOf(
+    buildList {
-        // currently gives a deprecation warning, but we've been told 
+      // currently gives a deprecation warning, but we've been told 
-        // that the "initialize everything at build time" *CLI* option is likely here to stay
+      // that the "initialize everything at build time" *CLI* option is likely here to stay
-        "--initialize-at-build-time="
+      add("--initialize-at-build-time=")
-        // needed for messagepack-java (see https://github.com/msgpack/msgpack-java/issues/600)
+      // needed for messagepack-java (see https://github.com/msgpack/msgpack-java/issues/600)
-        ,"--initialize-at-run-time=org.msgpack.core.buffer.DirectBufferAccess"
+      add("--initialize-at-run-time=org.msgpack.core.buffer.DirectBufferAccess")
-        ,"--no-fallback"
+      add("--no-fallback")
-        ,"-Djavax.net.ssl.trustStore=${trustStore.get().asFile}"
+      add("-Djavax.net.ssl.trustStore=${trustStore.get().asFile}")
-        ,"-Djavax.net.ssl.trustStorePassword=$trustStorePassword"
+      add("-Djavax.net.ssl.trustStorePassword=$trustStorePassword")
-        ,"-Djavax.net.ssl.trustStoreType=PKCS12"
+      add("-Djavax.net.ssl.trustStoreType=PKCS12")
-        // security property "ocsp.enable=true" is set in Main.kt
+      // security property "ocsp.enable=true" is set in Main.kt
-        ,"-Dcom.sun.net.ssl.checkRevocation=true"
+      add("-Dcom.sun.net.ssl.checkRevocation=true")
-        ,"-H:IncludeResources=org/pkl/core/stdlib/.*\\.pkl"
+      add("-H:IncludeResources=org/pkl/core/stdlib/.*\\.pkl")
-        ,"-H:IncludeResources=org/jline/utils/.*"
+      add("-H:IncludeResources=org/jline/utils/.*")
-        ,"-H:IncludeResourceBundles=org.pkl.core.errorMessages"
+      add("-H:IncludeResourceBundles=org.pkl.core.errorMessages")
-        ,"--macro:truffle"
+      add("--macro:truffle")
-        ,"-H:Class=org.pkl.cli.Main"
+      add("-H:Class=org.pkl.cli.Main")
-        ,"-H:Name=${outputFile.get().asFile.name}"
+      add("-H:Name=${outputFile.get().asFile.name}")
-        // the actual limit (currently) used by native-image is this number + 1400 (idea is to compensate for Truffle's own nodes)
+      // the actual limit (currently) used by native-image is this number + 1400 (idea is to compensate for Truffle's own nodes)
-        ,"-H:MaxRuntimeCompileMethods=1800"
+      add("-H:MaxRuntimeCompileMethods=1800")
-        ,"-H:+EnforceMaxRuntimeCompileMethods"
+      add("-H:+EnforceMaxRuntimeCompileMethods")
-        ,"--enable-url-protocols=http,https"
+      add("--enable-url-protocols=http,https")
-        ,"-H:+ReportExceptionStackTraces"
+      add("-H:+ReportExceptionStackTraces")
-        // disable automatic support for JVM CLI options (puts our main class in full control of argument parsing)
+      // disable automatic support for JVM CLI options (puts our main class in full control of argument parsing)
-        ,"-H:-ParseRuntimeOptions"
+      add("-H:-ParseRuntimeOptions")
-        // quick build mode: 40% faster compilation, 20% smaller (but presumably also slower) executable
+      // quick build mode: 40% faster compilation, 20% smaller (but presumably also slower) executable
-        ,if (!buildInfo.isReleaseBuild) "-Ob" else ""
+      if (!buildInfo.isReleaseBuild) {
-        // native-image rejects non-existing class path entries -> filter
+        add("-Ob")
-        ,"--class-path"
+      }
-        ,((sourceSets.main.get().output + configurations.runtimeClasspath.get())
+      // native-image rejects non-existing class path entries -> filter
-            .filter { it.exists() && !exclusions.any { exclude -> it.name.contains(exclude) }})
+      add("--class-path")
-            .asPath
+      val pathInput = sourceSets.main.get().output + configurations.runtimeClasspath.get()
-        // make sure dev machine stays responsive (15% slowdown on my laptop)
+        .filter { it.exists() && !exclusions.any { exclude -> it.name.contains(exclude) } }
-        ,"-J-XX:ActiveProcessorCount=${
+      add(pathInput.asPath)
-          Runtime.getRuntime().availableProcessors() / (if (buildInfo.os.isMacOsX && !buildInfo.isCiBuild) 4 else 1)
+      // make sure dev machine stays responsive (15% slowdown on my laptop)
-        }"
+      val processors = Runtime.getRuntime().availableProcessors() /
-    ) + extraArgs
+        if (buildInfo.os.isMacOsX && !buildInfo.isCiBuild) 4 else 1
+      add("-J-XX:ActiveProcessorCount=${processors}")
+      addAll(extraArgs)
+    }
   })
 }
 
@@ -322,12 +328,15 @@ tasks.assembleNative {
         dependsOn(macExecutableAarch64)
       }
     }
+
     buildInfo.os.isWindows -> {
       dependsOn(windowsExecutableAmd64)
     }
+
     buildInfo.os.isLinux && buildInfo.arch == "aarch64" -> {
       dependsOn(linuxExecutableAarch64)
     }
+
     buildInfo.os.isLinux && buildInfo.arch == "amd64" -> {
       dependsOn(linuxExecutableAmd64)
       if (buildInfo.hasMuslToolchain) {
@@ -362,11 +371,13 @@ publishing {
 
       pom {
         url.set("https://github.com/apple/pkl/tree/main/pkl-cli")
-        description.set("""
+        description.set(
+          """
           Pkl CLI executable for Java.
           Can be executed directly on *nix (if the `java` command is found on the PATH) and with `java -jar` otherwise.
           Requires Java 17 or higher.
-        """.trimIndent())
+        """.trimIndent()
+        )
       }
     }
     create<MavenPublication>("macExecutableAmd64") {