fix(build): track compose-multiplatform's actual version in the flatpak arm64 force-resolve (#6694)

This commit is contained in:
James Rich authored and GitHub committed 2026-08-13 23:18:12 +00:00
1 parent 80c9846cd7
commit 22387715c3
1 file changed
+17 -5
+17 -5
View File
@@ -42,13 +42,25 @@ plugins.withId("org.meshtastic.flatpak.sources") {
extensions.configure<org.meshtastic.flatpak.sources.FlatpakSourcesExtension> {
outputFile.set(layout.buildDirectory.file("flatpak-sources.json"))
mustRunAfterTasks.set(listOf(":desktopApp:assemble", ":desktopApp:packageUberJarForCurrentOS"))
// Force-resolve platform-specific native artifacts not resolved on the generation host.
// The compose-desktop version MUST track the compose-multiplatform catalog version, else the
// arm64 offline flatpak build fails to resolve desktop-jvm-linux-arm64 (skiko version per its POM).
// Force-resolve platform-specific native artifacts not resolved on the generation host (the
// manifest is generated on an x86_64 runner, but the offline build also needs to run on arm64).
//
// KEEP desktop-jvm's version IN SYNC with the compose-multiplatform entry in
// gradle/libs.versions.toml — that's exactly the maintenance trap that caused this to break once
// already: this block was pinned to 1.11.1 and never updated when the catalog moved to
// 1.12.0-rc01, so the arm64 offline flatpak build kept resolving (and shipping) URLs for a version
// nothing in the project used anymore. (A `libs.versions.composeMultiplatform` reference here
// would auto-track it, but that accessor isn't resolvable in this project's script — tried and
// confirmed via a direct `./gradlew help` failure — so it has to stay a literal that a human/agent
// updates by hand alongside any compose-multiplatform bump.)
//
// skiko isn't in this catalog at all — its version must track whatever desktop-jvm-<platform>'s
// own POM declares for org.jetbrains.skiko:skiko-awt-runtime-<platform> (0.150.1 for
// compose-multiplatform 1.12.0-rc01); check that POM again if this version is bumped.
targetPlatforms.set(setOf("linux-x64", "linux-arm64"))
platformDependencies.set(setOf(
"org.jetbrains.skiko:skiko-awt-runtime-{platform}:0.144.6",
"org.jetbrains.compose.desktop:desktop-jvm-{platform}:1.11.1",
"org.jetbrains.skiko:skiko-awt-runtime-{platform}:0.150.1",
"org.jetbrains.compose.desktop:desktop-jvm-{platform}:1.12.0-rc01",
))
}
}