fix: downstream native-image builds

- fix: don't exclude svm classes from `cli` jar

SVM (SubstrateVM) compile configuration classes
must be included within the `cli` jar to prevent
downstream `native-image` builds from failing.

- fix: include svm exclusions in fatjar config

Fat JARs cannot be used with `native-image`, so
these classes can still safely be excluded here.

Fixes and closes #907

Signed-off-by: Sam Gammon <sam@elide.dev>

Author: sgammon

buildSrc/src/main/kotlin/pklFatJar.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,6 +80,9 @@ tasks.shadowJar {
 
   configurations = listOf(project.configurations.runtimeClasspath.get())
 
+  // not required at runtime / fat JARs can't be used in native-image builds anyway
+  exclude("org/pkl/cli/svm/**")
+
   exclude("META-INF/maven/**")
   exclude("META-INF/upgrade/**")
   exclude("META-INF/versions/19/**")

pkl-cli/pkl-cli.gradle.kts

@@ -81,12 +81,7 @@ dependencies {
   stagedWindowsAmd64Executable(executableDir("pkl-windows-amd64.exe"))
 }
 
-tasks.jar {
-  manifest { attributes += mapOf("Main-Class" to "org.pkl.cli.Main") }
-
-  // not required at runtime
-  exclude("org/pkl/cli/svm/**")
-}
+tasks.jar { manifest { attributes += mapOf("Main-Class" to "org.pkl.cli.Main") } }
 
 tasks.javadoc { enabled = false }
 
@@ -157,7 +152,7 @@ tasks.check { dependsOn(testStartJavaExecutable) }
 fun Exec.configureExecutable(
   graalVm: BuildInfo.GraalVm,
   outputFile: Provider<RegularFile>,
-  extraArgs: List<String> = listOf()
+  extraArgs: List<String> = listOf(),
 ) {
   inputs
     .files(sourceSets.main.map { it.output })
@@ -240,7 +235,7 @@ val macExecutableAmd64: TaskProvider<Exec> by
     dependsOn(":installGraalVmAmd64")
     configureExecutable(
       buildInfo.graalVmAmd64,
-      layout.buildDirectory.file("executable/pkl-macos-amd64")
+      layout.buildDirectory.file("executable/pkl-macos-amd64"),
     )
   }
 
@@ -251,7 +246,7 @@ val macExecutableAarch64: TaskProvider<Exec> by
     configureExecutable(
       buildInfo.graalVmAarch64,
       layout.buildDirectory.file("executable/pkl-macos-aarch64"),
-      listOf("-H:+AllowDeprecatedBuilderClassesOnImageClasspath")
+      listOf("-H:+AllowDeprecatedBuilderClassesOnImageClasspath"),
     )
   }
 
@@ -261,7 +256,7 @@ val linuxExecutableAmd64: TaskProvider<Exec> by
     dependsOn(":installGraalVmAmd64")
     configureExecutable(
       buildInfo.graalVmAmd64,
-      layout.buildDirectory.file("executable/pkl-linux-amd64")
+      layout.buildDirectory.file("executable/pkl-linux-amd64"),
     )
   }
 
@@ -281,7 +276,7 @@ val linuxExecutableAarch64: TaskProvider<Exec> by
         // Ensure compatibility for kernels with page size set to 4k, 16k and 64k
         // (e.g. Raspberry Pi 5, Asahi Linux)
         "-H:PageSize=65536"
-      )
+      ),
     )
   }
 
@@ -297,7 +292,7 @@ val alpineExecutableAmd64: TaskProvider<Exec> by
     configureExecutable(
       buildInfo.graalVmAmd64,
       layout.buildDirectory.file("executable/pkl-alpine-linux-amd64"),
-      listOf("--static", "--libc=musl")
+      listOf("--static", "--libc=musl"),
     )
   }
 
@@ -307,7 +302,7 @@ val windowsExecutableAmd64: TaskProvider<Exec> by
     configureExecutable(
       buildInfo.graalVmAmd64,
       layout.buildDirectory.file("executable/pkl-windows-amd64"),
-      listOf("-Dfile.encoding=UTF-8")
+      listOf("-Dfile.encoding=UTF-8"),
     )
   }