Replace :core:proto with org.meshtastic:protobufs:2.7.25

androidApp/build.gradle.kts

@@ -210,7 +210,7 @@ dependencies {
     implementation(projects.core.network)
     implementation(projects.core.nfc)
     implementation(projects.core.prefs)
-    implementation(projects.core.proto)
+    implementation(libs.meshtastic.protobufs)
     implementation(projects.core.service)
     implementation(projects.core.resources)
     implementation(projects.core.ui)

build-logic/convention/src/main/kotlin/RootConventionPlugin.kt

@@ -95,7 +95,6 @@ private val ALL_MODULES_FULL =
         ":core:network",
         ":core:nfc",
         ":core:prefs",
-        ":core:proto",
         ":core:repository",
         ":core:service",
         ":core:resources",
@@ -118,11 +117,10 @@ private val ALL_MODULES_FULL =
 private val ANDROID_ONLY_MODULES = setOf(":androidApp", ":core:api", ":core:barcode", ":feature:widget")
 
 /**
- * Modules excluded from Dokka aggregation. :core:proto contains only auto-generated Wire classes (no KDoc value) and
- * its TAKPacket-SDK dependency doesn't publish iOS metadata JARs, causing `transformCommonMainDependenciesMetadata` to
- * fail during Dokka resolution.
+ * Modules excluded from Dokka aggregation. Empty now that :core:proto has been replaced by
+ * the external org.meshtastic:protobufs SDK.
  */
-private val DOKKA_EXCLUDED_MODULES = setOf(":core:proto")
+private val DOKKA_EXCLUDED_MODULES = emptySet<String>()
 
 private fun allModules(): List<String> = ALL_MODULES_FULL
 

build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/KotlinAndroid.kt

@@ -147,20 +147,6 @@ internal fun Project.configureKotlinMultiplatform() {
         }
     }
 
-    // TAKPacket-SDK doesn't publish iOS metadata JARs (the .klib exists but the metadata
-    // .jar returns 404). iOS native compilation resolves fine via .klib, but
-    // `transformCommonMainDependenciesMetadata` (triggered by Dokka/publishing) fails.
-    // Exclude the SDK only from the CompilationDependenciesMetadata configs that feed
-    // the metadata transform — NOT from Implementation/Resolvable configs which feed the
-    // actual compiler classpath.
-    val iosMetadataConfigs =
-        setOf("iosArm64CompilationDependenciesMetadata", "iosSimulatorArm64CompilationDependenciesMetadata")
-    configurations.configureEach {
-        if (name in iosMetadataConfigs) {
-            exclude(mapOf("group" to "org.meshtastic", "module" to "takpacket-sdk"))
-        }
-    }
-
     configureMokkery()
     configureKotlin<KotlinMultiplatformExtension>()
 }

build.gradle.kts

@@ -46,11 +46,13 @@ 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
+        // 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).
         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.0",
+            "org.jetbrains.compose.desktop:desktop-jvm-{platform}:1.11.1",
         ))
     }
 }

core/data/build.gradle.kts

@@ -35,7 +35,7 @@ kotlin {
             implementation(projects.core.model)
             implementation(projects.core.network)
             implementation(projects.core.prefs)
-            implementation(projects.core.proto)
+            implementation(libs.meshtastic.protobufs)
             implementation(projects.core.takserver)
 
             implementation(libs.jetbrains.lifecycle.runtime)

core/database/build.gradle.kts

@@ -38,7 +38,7 @@ kotlin {
             api(projects.core.common)
             implementation(projects.core.di)
             api(projects.core.model)
-            implementation(projects.core.proto)
+            implementation(libs.meshtastic.protobufs)
             implementation(projects.core.resources)
             implementation(libs.androidx.room.paging)
             implementation(libs.kotlinx.serialization.json)

core/datastore/build.gradle.kts

@@ -28,7 +28,7 @@ kotlin {
         commonMain.dependencies {
             implementation(projects.core.common)
             implementation(projects.core.model)
-            implementation(projects.core.proto)
+            implementation(libs.meshtastic.protobufs)
             api(libs.androidx.datastore)
             api(libs.androidx.datastore.preferences)
             implementation(libs.kotlinx.serialization.json)

core/domain/build.gradle.kts

@@ -27,7 +27,7 @@ kotlin {
         commonMain.dependencies {
             implementation(projects.core.repository)
             implementation(projects.core.model)
-            implementation(projects.core.proto)
+            implementation(libs.meshtastic.protobufs)
             implementation(projects.core.common)
             implementation(projects.core.database)
             implementation(projects.core.datastore)

core/model/build.gradle.kts

@@ -31,7 +31,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(projects.core.proto)
+            api(libs.meshtastic.protobufs)
             api(projects.core.common)
             api(projects.core.resources)
 
@@ -42,6 +42,17 @@ kotlin {
             api(libs.okio)
             api(libs.compose.multiplatform.resources)
         }
+        jvmAndroidMain.dependencies {
+            // TAKPacket-SDK publishes only JVM artifacts since 0.5.2 (proto types
+            // now come from the protobufs SDK above; the CoT conversion pipeline is
+            // zstd-jni/xpp3-bound). Scoped to jvmAndroidMain so iOS compilations
+            // never try to resolve it — iOS code goes through the expect/actual
+            // seams in :core:takserver instead.
+            api(libs.takpacket.sdk.kmp.get().toString()) {
+                exclude(group = "com.github.luben", module = "zstd-jni")
+                exclude(group = "org.ogce", module = "xpp3")
+            }
+        }
         androidMain.dependencies {
             api(libs.androidx.annotation)
             api(libs.androidx.core.ktx)

core/network/build.gradle.kts

@@ -31,7 +31,7 @@ kotlin {
             implementation(projects.core.common)
             implementation(projects.core.di)
             implementation(projects.core.model)
-            implementation(projects.core.proto)
+            implementation(libs.meshtastic.protobufs)
             implementation(projects.core.ble)
 
             implementation(libs.okio)