From 2d6425e0786bfd6eac00f6e817ee3f95138a655f Mon Sep 17 00:00:00 2001 From: niccellular <79813408+niccellular@users.noreply.github.com> Date: Thu, 28 May 2026 16:30:27 -0400 Subject: [PATCH] fix(proto): bump submodule to #927 (disable/DISABLED) and drop stale Marti prune Moves core/proto to PR #927 head (c834f6b), which adds LockdownAuth.disable and LockdownStatus.State.DISABLED on top of develop. That tree has no meshtastic.Marti message, so the Marti prune left over from the master merge was unused and broke generateCommonMainProtos; remove it. Co-Authored-By: Claude Opus 4.7 --- core/proto/build.gradle.kts | 1 - core/proto/src/main/proto | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/core/proto/build.gradle.kts b/core/proto/build.gradle.kts index ced0614e8b..cccc661e45 100644 --- a/core/proto/build.gradle.kts +++ b/core/proto/build.gradle.kts @@ -120,7 +120,6 @@ wire { prune("meshtastic.GeoPointSource") prune("meshtastic.TakTalkMessage") prune("meshtastic.TakTalkRoomData") - prune("meshtastic.Marti") } // Modern KMP publication uses the project name as the artifactId by default. diff --git a/core/proto/src/main/proto b/core/proto/src/main/proto index 83ce840394..c834f6b76e 160000 --- a/core/proto/src/main/proto +++ b/core/proto/src/main/proto @@ -1 +1 @@ -Subproject commit 83ce840394554eb59404bbf76805d70664d931a6 +Subproject commit c834f6b76e75f3318e5746ad43ae151a969a852a