From 07639900c9a6df1cbb9a7b7e05fc1834aad74274 Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Thu, 29 Jan 2026 14:10:58 -0600
Subject: [PATCH] chore: Apply maven-publish plugin consistently (#4364)

---
 .../src/main/kotlin/AndroidLibraryConventionPlugin.kt         | 1 +
 .../convention/src/main/kotlin/KmpLibraryConventionPlugin.kt  | 1 +
 gradle/publishing.gradle.kts                                  | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
index 0ded09806..a1ef4078f 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -34,6 +34,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
             apply(plugin = "meshtastic.spotless")
             apply(plugin = "meshtastic.dokka")
             apply(plugin = "meshtastic.kover")
+            apply(plugin = "maven-publish")
 
             extensions.configure<LibraryExtension> {
                 configureKotlinAndroid(this)
diff --git a/build-logic/convention/src/main/kotlin/KmpLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/KmpLibraryConventionPlugin.kt
index 687f70fe7..7162b9ae0 100644
--- a/build-logic/convention/src/main/kotlin/KmpLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/KmpLibraryConventionPlugin.kt
@@ -32,6 +32,7 @@ class KmpLibraryConventionPlugin : Plugin<Project> {
             apply(plugin = "meshtastic.spotless")
             apply(plugin = "meshtastic.dokka")
             apply(plugin = "meshtastic.kover")
+            apply(plugin = "maven-publish")
 
             configureKotlinMultiplatform()
         }
diff --git a/gradle/publishing.gradle.kts b/gradle/publishing.gradle.kts
index adaa9de7a..d8199b685 100644
--- a/gradle/publishing.gradle.kts
+++ b/gradle/publishing.gradle.kts
@@ -1,5 +1,7 @@
-import java.util.Properties
 import java.io.FileInputStream
+import java.util.Properties
+
+project.pluginManager.apply("maven-publish")
 
 val configProperties = Properties()
 val configFile = rootProject.file("config.properties")