From f7a226b9d0e4a00e4bd118c0b4e28c508136664d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 30 May 2026 19:25:27 +0000
Subject: [PATCH 1/2] chore(deps): update core/proto/src/main/proto digest to
 a0a2239

---
 core/proto/src/main/proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/proto/src/main/proto b/core/proto/src/main/proto
index dd6c3f850a..a0a2239c6f 160000
--- a/core/proto/src/main/proto
+++ b/core/proto/src/main/proto
@@ -1 +1 @@
-Subproject commit dd6c3f850a56a00cbc2cc5b93db2fd43b1a2f46a
+Subproject commit a0a2239c6fc08bc70499dd04a5c72b78d6e9b265

From fc61ead75e6855a81c84c0b3f5edb106b7958297 Mon Sep 17 00:00:00 2001
From: James Rich <james.a.rich@gmail.com>
Date: Sat, 30 May 2026 14:26:05 -0500
Subject: [PATCH 2/2] fix(proto): exclude symlinked duplicates from Wire
 sourcePath

Upstream protobufs added packages/kmp/proto/ with symlinks pointing
back to the root-level meshtastic/ and nanopb.proto files. Wire follows
these symlinks during source discovery, causing duplicate type
definitions and build failures.

Add include patterns to restrict Wire's sourcePath to only the
root-level proto files and the google/protobuf descriptors from
wire-includes.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 core/proto/build.gradle.kts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/proto/build.gradle.kts b/core/proto/build.gradle.kts
index 412e12e90b..29a67f87d3 100644
--- a/core/proto/build.gradle.kts
+++ b/core/proto/build.gradle.kts
@@ -58,6 +58,11 @@ wire {
     sourcePath {
         srcDir("src/main/proto")
         srcDir("src/main/wire-includes")
+        // Upstream added packages/kmp/ with symlinks back to root protos.
+        // Without filtering, Wire follows the symlinks and loads duplicates.
+        include("meshtastic/**/*.proto")
+        include("nanopb.proto")
+        include("google/**/*.proto")
     }
     kotlin {
         // Wire 6 optimization: Avoid unnecessary immutable copies of repeated/map fields.