Skip to content

Fix: Require BellSoft vendor for JDK 25 native-image toolchain (#251) #367

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
b-re-w merged 1 commit into from
Nov 4, 2026
+8 −6
Merged

Fix: Require BellSoft vendor for JDK 25 native-image toolchain (#251) #367

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
8 changes: 3 additions & 5 deletions .github/workflows/desktop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,13 @@ jobs:

# Records Compose and skiko's configuration against the fork version this run uses, then builds
# the image and runs it with JAVA_HOME and PYTHONHOME removed: 20 of 20 and no libjvm.
# `setup-graalvm` installs Liberica NIK under `GRAALVM_HOME` in the runner toolcache, whereas
# macOS runner images also pre-install Temurin 25 in `/Library/Java/JavaVirtualMachines`.
# Disable toolchain auto-detection and pass `org.gradle.java.installations.paths="$GRAALVM_HOME"`
# so Gradle's JavaLanguageVersion(25) launcher selects Liberica NIK 25 instead of Temurin 25.
# `setup-graalvm` installs Liberica NIK under `GRAALVM_HOME` in the runner toolcache outside
# `/Users/runner/hostedtoolcache/Java_*`, so pass `org.gradle.java.installations.paths`
# explicitly so Gradle's BellSoft JDK 25 toolchain resolution finds it.
- name: Build and run the native image
run: >
./gradlew :python-multiplatform-compose:fixtures:notebook-e2e:notebookE2eNativeAgent
:python-multiplatform-compose:fixtures:notebook-e2e:notebookE2eNativeRun
-PpythonxComposeWheel="$WHEEL_DIR"
-Porg.gradle.java.installations.auto-detect=false
-Porg.gradle.java.installations.paths="$GRAALVM_HOME"
--console=plain
5 changes: 4 additions & 1 deletion python-multiplatform-compose/fixtures/notebook-e2e/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,10 @@ val e2eMainClass = "fixture.notebook.NotebookE2eMainKt"
val e2eNativeConfig = layout.projectDirectory.dir("src/desktopTest/native-image")
val e2eNativeDir = layout.buildDirectory.dir("native/notebook-e2e")
val e2eAppDir = layout.projectDirectory.dir("src/desktopTest/python")
val e2eJdk25 = javaToolchains.launcherFor { languageVersion.set(JavaLanguageVersion.of(25)) }
val e2eJdk25 = javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(25))
vendor.set(JvmVendorSpec.BELLSOFT)
}

fun JavaExec.notebookE2eOnTheJvm() {
dependsOn(e2eTestCompilation.compileTaskProvider, installPythonxComposeWheel)
Expand Down
1 change: 1 addition & 0 deletions sample/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,7 @@ tasks.matching { it.name == "run" }.configureEach {

val nativeImageJavaLauncher = javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(25))
vendor.set(JvmVendorSpec.BELLSOFT)
}

val nativeImageOutputDir = layout.buildDirectory.dir("native/nativeCompile")
Expand Down