build: migrate KMP Android DSL from androidLibrary {} to android {} (#5734)

jamesarich · claude · web-flow · commit ea872f36d092 · 2026-06-03T15:02:43.000-05:00
Co-authored-by: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/KotlinAndroid.kt
@@ -118,7 +118,7 @@ internal fun Project.configureKotlinMultiplatform() {
 
                 // Default: disable Android resources for most KMP modules.
                 // Modules that need resources (e.g. core:resources) override this
-                // explicitly in their build.gradle.kts androidLibrary {} block.
+                // explicitly in their build.gradle.kts android {} block.
                 androidResources.enable = false
 
                 // Set the namespace automatically if not already set
diff --git a/core/ble/build.gradle.kts b/core/ble/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary { withHostTest { isIncludeAndroidResources = true } }
+    android { withHostTest { isIncludeAndroidResources = true } }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary { withHostTest { isIncludeAndroidResources = true } }
+    android { withHostTest { isIncludeAndroidResources = true } }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary { withHostTest { isIncludeAndroidResources = true } }
+    android { withHostTest { isIncludeAndroidResources = true } }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary {
+    android {
         withHostTest { isIncludeAndroidResources = true }
         withDeviceTest { instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" }
     }
diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary { withHostTest {} }
+    android { withHostTest {} }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/core/domain/build.gradle.kts b/core/domain/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary { withHostTest { isIncludeAndroidResources = true } }
+    android { withHostTest { isIncludeAndroidResources = true } }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary {
+    android {
         withHostTest { isIncludeAndroidResources = true }
         withDeviceTest { instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" }
     }
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary { withHostTest { isIncludeAndroidResources = true } }
+    android { withHostTest { isIncludeAndroidResources = true } }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/core/prefs/build.gradle.kts b/core/prefs/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary { withHostTest {} }
+    android { withHostTest {} }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/core/proto/build.gradle.kts b/core/proto/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
 
 kotlin {
     // Override minSdk for ATAK compatibility (standard is 26)
-    androidLibrary { minSdk = 21 }
+    android { minSdk = 21 }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/core/repository/build.gradle.kts b/core/repository/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary { withHostTest {} }
+    android { withHostTest {} }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/core/resources/build.gradle.kts b/core/resources/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary {
+    android {
         androidResources {
             enable = true
             resourcePrefix = "meshtastic_"
diff --git a/core/service/build.gradle.kts b/core/service/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary { withHostTest { isIncludeAndroidResources = true } }
+    android { withHostTest { isIncludeAndroidResources = true } }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/core/takserver/build.gradle.kts b/core/takserver/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 
 kotlin {
     @Suppress("UnstableApiUsage")
-    androidLibrary { withHostTest { isIncludeAndroidResources = true } }
+    android { withHostTest { isIncludeAndroidResources = true } }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts
@@ -18,7 +18,7 @@
 plugins { alias(libs.plugins.meshtastic.kmp.library) }
 
 kotlin {
-    androidLibrary { withHostTest {} }
+    android { withHostTest {} }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -26,7 +26,7 @@ plugins {
 kotlin {
     // Required for CMP files/ resources (emoji-data.json) to be packaged as Android assets.
     // Without this, Res.readBytes() throws MissingResourceException at runtime.
-    androidLibrary { androidResources.enable = true }
+    android { androidResources.enable = true }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/feature/connections/build.gradle.kts b/feature/connections/build.gradle.kts
@@ -18,7 +18,7 @@
 plugins { alias(libs.plugins.meshtastic.kmp.feature) }
 
 kotlin {
-    androidLibrary { withHostTest { isIncludeAndroidResources = true } }
+    android { withHostTest { isIncludeAndroidResources = true } }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/feature/firmware/build.gradle.kts b/feature/firmware/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary { withHostTest { isIncludeAndroidResources = true } }
+    android { withHostTest { isIncludeAndroidResources = true } }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/feature/intro/build.gradle.kts b/feature/intro/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary { withHostTest { isIncludeAndroidResources = true } }
+    android { withHostTest { isIncludeAndroidResources = true } }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/feature/map/build.gradle.kts b/feature/map/build.gradle.kts
@@ -20,7 +20,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary { withHostTest { isIncludeAndroidResources = true } }
+    android { withHostTest { isIncludeAndroidResources = true } }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/feature/node/build.gradle.kts b/feature/node/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary { withHostTest { isIncludeAndroidResources = true } }
+    android { withHostTest { isIncludeAndroidResources = true } }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/feature/wifi-provision/build.gradle.kts b/feature/wifi-provision/build.gradle.kts
@@ -20,7 +20,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary {
+    android {
         namespace = "org.meshtastic.feature.wifiprovision"
         withHostTest {}
     }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ plugins {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`kotlin {`
`24`		`- androidLibrary { withHostTest { isIncludeAndroidResources = true } }`
	`24`	`+ android { withHostTest { isIncludeAndroidResources = true } }`
`25`	`25`
`26`	`26`	`sourceSets {`
`27`	`27`	`commonMain.dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ plugins {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`kotlin {`
`26`		`- androidLibrary { withHostTest { isIncludeAndroidResources = true } }`
	`26`	`+ android { withHostTest { isIncludeAndroidResources = true } }`
`27`	`27`
`28`	`28`	`sourceSets {`
`29`	`29`	`commonMain.dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ plugins {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`kotlin {`
`27`		`- androidLibrary {`
	`27`	`+ android {`
`28`	`28`	`withHostTest { isIncludeAndroidResources = true }`
`29`	`29`	`withDeviceTest { instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" }`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ plugins {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`kotlin {`
`25`		`- androidLibrary { withHostTest {} }`
	`25`	`+ android { withHostTest {} }`
`26`	`26`
`27`	`27`	`sourceSets {`
`28`	`28`	`commonMain.dependencies {`