starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-01-11 22:30:54 +01:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

fix: downstream native-image builds (#914)

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

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

Fixes and closes apple/pkl#907

Signed-off-by: Sam Gammon <sam@elide.dev>
This commit is contained in:
Sam Gammon
2025-01-29 20:31:05 -08:00
committed by GitHub
parent aa8a0f18e8
commit 3fa935b390
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
buildSrc/src/main/kotlin/pklFatJar.gradle.kts
View File

@@ -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/**")

21
pkl-cli/pkl-cli.gradle.kts
View File

@@ -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"),
)
}