diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index 1799d369..6a80f31e 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -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 diff --git a/python-multiplatform-compose/fixtures/notebook-e2e/build.gradle.kts b/python-multiplatform-compose/fixtures/notebook-e2e/build.gradle.kts index 8c4915a8..0c269b73 100644 --- a/python-multiplatform-compose/fixtures/notebook-e2e/build.gradle.kts +++ b/python-multiplatform-compose/fixtures/notebook-e2e/build.gradle.kts @@ -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) diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 2c9f5e32..326e10cb 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -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")