Skip to content

Commit 0608f53

Browse files
jamesarichclaude
andcommitted
fix(desktop): provision JDK 25 in the offline Flatpak sandbox
The JBR 25 toolchain bump (#6203) raised desktopApp's jvmToolchain to languageVersion 25, but the offline manifest still provisioned only the openjdk21 SDK extension. With toolchain auto-provisioning disabled (the build is offline by design), compileJava failed on both arches with 'Cannot find a Java installation matching languageVersion=25'. Swap to the openjdk25 extension and note the coupling in the manifest. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
1 parent 8453071 commit 0608f53

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

scripts/verify-flatpak/desktop-offline.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ runtime: org.freedesktop.Platform
1111
runtime-version: '25.08'
1212
sdk: org.freedesktop.Sdk
1313
sdk-extensions:
14-
- org.freedesktop.Sdk.Extension.openjdk21
14+
# Must match desktopApp's jvmToolchain languageVersion — the offline build disables
15+
# toolchain auto-provisioning, so a toolchain bump without updating this extension
16+
# (and the three /usr/lib/sdk/openjdk* paths below) fails at compileJava.
17+
- org.freedesktop.Sdk.Extension.openjdk25
1518
command: meshtastic-wrapper.sh
1619

1720
finish-args:
@@ -56,9 +59,9 @@ modules:
5659
- name: meshtastic-desktop
5760
buildsystem: simple
5861
build-options:
59-
append-path: "/usr/lib/sdk/openjdk21/bin"
62+
append-path: "/usr/lib/sdk/openjdk25/bin"
6063
env:
61-
JAVA_HOME: /usr/lib/sdk/openjdk21/jvm/openjdk-21
64+
JAVA_HOME: /usr/lib/sdk/openjdk25/jvm/openjdk-25
6265
# Point Gradle at the offline mirror produced by flatpak-sources.json
6366
GRADLE_USER_HOME: /run/build/meshtastic-desktop/.gradle
6467
build-commands:
@@ -73,7 +76,7 @@ modules:
7376
- sed -i 's|distributionUrl=.*|distributionUrl=gradle-all.zip|' gradle/wrapper/gradle-wrapper.properties
7477
- echo "org.gradle.java.installations.auto-detect=false" >> gradle.properties
7578
- echo "org.gradle.java.installations.auto-download=false" >> gradle.properties
76-
- echo "org.gradle.java.installations.paths=/usr/lib/sdk/openjdk21/jvm/openjdk-21" >> gradle.properties
79+
- echo "org.gradle.java.installations.paths=/usr/lib/sdk/openjdk25/jvm/openjdk-25" >> gradle.properties
7780
- >
7881
sed -i
7982
's/^\(\s*\)vendor\.set(JvmVendorSpec\.JETBRAINS)/\1\/\/ vendor.set(JvmVendorSpec.JETBRAINS)/'

0 commit comments

Comments
 (0)