mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-14 02:49:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(build): remove Compose BOM to resolve compileSdk 37 conflict (#5088)

Browse Source
This commit is contained in:
James Rich
2026-04-12 12:05:52 -05:00
committed by GitHub
parent 916eb51b94
commit d03e61af6f
4 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build-logic/convention/src/main/kotlin/KmpFeatureConventionPlugin.kt
View File

@@ -56,9 +56,6 @@ class KmpFeatureConventionPlugin : Plugin<Project> {
}
sourceSets.getByName("androidMain").dependencies {
// Compose BOM for consistent Android Compose versions
implementation(target.dependencies.platform(libs.library("androidx-compose-bom")))
// Common Android Compose dependencies
implementation(libs.library("accompanist-permissions"))
implementation(libs.library("androidx-activity-compose"))

5
build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt
View File

@@ -26,11 +26,6 @@ internal fun Project.configureAndroidCompose(commonExtension: CommonExtension) {
val hasAndroidTest = project.projectDir.resolve("src/androidTest").exists()
dependencies {
val bom = libs.library("androidx-compose-bom")
"implementation"(platform(bom))
if (hasAndroidTest) {
"androidTestImplementation"(platform(bom))
}
"debugImplementation"(libs.library("compose-multiplatform-ui-tooling"))
"implementation"(libs.library("compose-multiplatform-runtime"))
"runtimeOnly"(libs.library("androidx-compose-runtime-tracing"))

15
gradle/libs.versions.toml
View File

@@ -118,18 +118,11 @@ androidx-sqlite-bundled = { module = "androidx.sqlite:sqlite-bundled", version =
androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version = "2.11.2" }
androidx-work-testing = { module = "androidx.work:work-testing", version = "2.11.2" }
# AndroidX Compose
androidx-compose-bom = { module = "androidx.compose:compose-bom-alpha", version = "2026.04.00" }
androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" } # Only used by deprecated mesh_service_example — remove when that module is deleted
androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
# AndroidX Compose (explicit versions — BOM removed to avoid transitive compileSdk conflicts with CMP adaptive fork)
androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended", version = "1.7.8" } # Only used by deprecated mesh_service_example — remove when that module is deleted
androidx-compose-runtime-tracing = { module = "androidx.compose.runtime:runtime-tracing", version.ref = "androidxTracing" }
androidx-compose-ui = { module = "androidx.compose.ui:ui" }
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
androidx-compose-ui-text = { module = "androidx.compose.ui:ui-text" }
androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version = "1.11.0-rc01" }
androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version = "1.11.0-rc01" }
# Compose Multiplatform
compose-multiplatform-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose-multiplatform" }

2
mesh_service_example/build.gradle.kts
View File

@@ -44,7 +44,7 @@ dependencies {
implementation(libs.androidx.activity.compose)
implementation(libs.jetbrains.lifecycle.viewmodel.compose)
implementation(libs.jetbrains.lifecycle.runtime)
implementation(libs.androidx.compose.material3)
implementation(libs.compose.multiplatform.material3)
implementation(libs.androidx.compose.material.iconsExtended)
implementation(libs.material)