Skip to content

fix: downstream native-image builds #914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 30, 2025
+12 −14
Merged

fix: downstream native-image builds #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion buildSrc/src/main/kotlin/pklFatJar.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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/**")
Expand Down
21 changes: 8 additions & 13 deletions pkl-cli/pkl-cli.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

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

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

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

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

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

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

Expand Down