mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-06-25 22:15:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore(deps): re-pin protobufs to v-less snapshot 2.7.26-4b8d665-SNAPSHOT, drop resolution override (#5942)

Browse Source 
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
James Rich
2026-06-24 18:27:38 -05:00
committed by GitHub
parent d81a91a9da
commit fa223bfc08
2 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
build.gradle.kts
View File

@@ -59,27 +59,3 @@ plugins.withId("org.meshtastic.flatpak.sources") {
dependencies {
dokkaPlugin(libs.dokka.android.documentation.plugin)
}
// ─── TEMPORARY: protobufs commit-pinned snapshot preview (PR #5834) ──────────────────────────────
// We track the unreleased protobufs snapshot v2.7.26-497cd88-SNAPSHOT for the LoRa region→preset map (#951).
// protobufs #959 switched RB snapshot publishing to immutable per-commit vX.Y.Z-{shorthash}-SNAPSHOT
// coordinates; pin the exact one rather than the moving develop-SNAPSHOT.
// takpacket-sdk:0.7.0 STILL transitively pins protobufs:2.7.25 (verified against its POM), and
// Gradle ranks 2.7.25 > v2.7.26-…-SNAPSHOT (the numeric "2" outranks the "v2" string qualifier).
// That downgrades the test *runtime* classpath to 2.7.25 while the common-metadata *compile* uses
// the snapshot, yielding NoSuchFieldError/NoSuchMethodError on the proto-generated classes at test
// runtime (assembleDebug/detekt don't catch it; test/allTests do). Force every protobufs* variant
// to the snapshot so compile and runtime agree. Safe because atak.proto is unchanged, so takpacket's
// own message ABI stays compatible with the newer protobufs.
// REMOVE once protobufs cuts a tagged release containing #951 (re-pin the catalog to it) — and,
// ideally, once takpacket-sdk is republished against that release.
allprojects {
configurations.all {
resolutionStrategy.eachDependency {
if (requested.group == "org.meshtastic" && requested.name.startsWith("protobufs")) {
useVersion("v2.7.26-497cd88-SNAPSHOT")
because("preview #5834: override takpacket transitive protobufs:2.7.25 pin")
}
}
}
}

2
gradle/libs.versions.toml
View File

@@ -95,7 +95,7 @@ mqttastic = "0.4.0"
jmdns = "3.6.3"
qrcode-kotlin = "4.5.0"
takpacket-sdk = "0.7.0"
meshtastic-protobufs = "v2.7.26-497cd88-SNAPSHOT"
meshtastic-protobufs = "2.7.26-4b8d665-SNAPSHOT"
# Gradle Plugins
develocity = "4.4.3"