Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamesarich merged 1 commit into from
Jun 3, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/KotlinAndroid.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/ble/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
}

kotlin {
androidLibrary { withHostTest { isIncludeAndroidResources = true } }
android { withHostTest { isIncludeAndroidResources = true } }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion core/common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {
}

kotlin {
androidLibrary { withHostTest { isIncludeAndroidResources = true } }
android { withHostTest { isIncludeAndroidResources = true } }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion core/data/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {
}

kotlin {
androidLibrary { withHostTest { isIncludeAndroidResources = true } }
android { withHostTest { isIncludeAndroidResources = true } }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion core/database/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}

kotlin {
androidLibrary {
android {
withHostTest { isIncludeAndroidResources = true }
withDeviceTest { instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" }
}
Expand Down
2 changes: 1 addition & 1 deletion core/datastore/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {
}

kotlin {
androidLibrary { withHostTest {} }
android { withHostTest {} }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion core/domain/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
}

kotlin {
androidLibrary { withHostTest { isIncludeAndroidResources = true } }
android { withHostTest { isIncludeAndroidResources = true } }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion core/model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}

kotlin {
androidLibrary {
android {
withHostTest { isIncludeAndroidResources = true }
withDeviceTest { instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" }
}
Expand Down
2 changes: 1 addition & 1 deletion core/network/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {
}

kotlin {
androidLibrary { withHostTest { isIncludeAndroidResources = true } }
android { withHostTest { isIncludeAndroidResources = true } }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion core/prefs/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
}

kotlin {
androidLibrary { withHostTest {} }
android { withHostTest {} }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion core/proto/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {

kotlin {
// Override minSdk for ATAK compatibility (standard is 26)
androidLibrary { minSdk = 21 }
android { minSdk = 21 }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion core/repository/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
}

kotlin {
androidLibrary { withHostTest {} }
android { withHostTest {} }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion core/resources/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
}

kotlin {
androidLibrary {
android {
androidResources {
enable = true
resourcePrefix = "meshtastic_"
Expand Down
2 changes: 1 addition & 1 deletion core/service/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
}

kotlin {
androidLibrary { withHostTest { isIncludeAndroidResources = true } }
android { withHostTest { isIncludeAndroidResources = true } }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion core/takserver/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {

kotlin {
@Suppress("UnstableApiUsage")
androidLibrary { withHostTest { isIncludeAndroidResources = true } }
android { withHostTest { isIncludeAndroidResources = true } }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion core/testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
plugins { alias(libs.plugins.meshtastic.kmp.library) }

kotlin {
androidLibrary { withHostTest {} }
android { withHostTest {} }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion core/ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion feature/connections/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
plugins { alias(libs.plugins.meshtastic.kmp.feature) }

kotlin {
androidLibrary { withHostTest { isIncludeAndroidResources = true } }
android { withHostTest { isIncludeAndroidResources = true } }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion feature/firmware/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
}

kotlin {
androidLibrary { withHostTest { isIncludeAndroidResources = true } }
android { withHostTest { isIncludeAndroidResources = true } }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion feature/intro/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
}

kotlin {
androidLibrary { withHostTest { isIncludeAndroidResources = true } }
android { withHostTest { isIncludeAndroidResources = true } }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion feature/map/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
}

kotlin {
androidLibrary { withHostTest { isIncludeAndroidResources = true } }
android { withHostTest { isIncludeAndroidResources = true } }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion feature/node/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
}

kotlin {
androidLibrary { withHostTest { isIncludeAndroidResources = true } }
android { withHostTest { isIncludeAndroidResources = true } }

sourceSets {
commonMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion feature/wifi-provision/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
}

kotlin {
androidLibrary {
android {
namespace = "org.meshtastic.feature.wifiprovision"
withHostTest {}
}
Expand Down