meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

build: migrate Compose dependencies to Compose Multiplatform (#5084)

Browse source
This commit is contained in:
James Rich 2026-04-12 09:45:11 -05:00 • committed by GitHub
parent 9281324be3
commit 7ca7179197
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle.kts
View file

@ -243,9 +243,9 @@ dependencies {
implementation(libs.jetbrains.compose.material3.adaptive.layout)
implementation(libs.jetbrains.compose.material3.adaptive.navigation)
implementation(libs.material)
implementation(libs.androidx.compose.material3)
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.compose.ui.text)
implementation(libs.compose.multiplatform.material3)
implementation(libs.compose.multiplatform.ui.tooling.preview)
implementation(libs.compose.multiplatform.ui)
implementation(libs.androidx.glance.appwidget)
implementation(libs.androidx.glance.appwidget.preview)
implementation(libs.androidx.glance.material3)

6
build-logic/convention/src/main/kotlin/KmpFeatureConventionPlugin.kt
View file

@ -62,10 +62,10 @@ class KmpFeatureConventionPlugin : Plugin<Project> {
// Common Android Compose dependencies
implementation(libs.library("accompanist-permissions"))
implementation(libs.library("androidx-activity-compose"))
implementation(libs.library("androidx-compose-material3"))
implementation(libs.library("compose-multiplatform-material3"))
implementation(libs.library("androidx-compose-ui-text"))
implementation(libs.library("androidx-compose-ui-tooling-preview"))
implementation(libs.library("compose-multiplatform-ui"))
implementation(libs.library("compose-multiplatform-ui-tooling-preview"))
}
sourceSets.getByName("commonTest").dependencies { implementation(project(":core:testing")) }

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

@ -31,11 +31,10 @@ internal fun Project.configureAndroidCompose(commonExtension: CommonExtension) {
if (hasAndroidTest) {
"androidTestImplementation"(platform(bom))
}
"debugImplementation"(libs.library("androidx-compose-ui-tooling"))
"implementation"(libs.library("androidx-compose-runtime"))
"debugImplementation"(libs.library("compose-multiplatform-ui-tooling"))
"implementation"(libs.library("compose-multiplatform-runtime"))
"runtimeOnly"(libs.library("androidx-compose-runtime-tracing"))
"implementation"(libs.library("compose-multiplatform-runtime"))
"implementation"(libs.library("compose-multiplatform-resources"))
// Add Espresso explicitly to avoid version mismatch issues on newer Android versions

6
core/barcode/build.gradle.kts
View file

@ -33,9 +33,9 @@ dependencies {
implementation(projects.core.ui)
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.compose.material3)
implementation(libs.androidx.compose.runtime)
implementation(libs.androidx.compose.ui)
implementation(libs.compose.multiplatform.material3)
implementation(libs.compose.multiplatform.runtime)
implementation(libs.compose.multiplatform.ui)
implementation(libs.accompanist.permissions)
implementation(libs.kermit)

1
feature/intro/build.gradle.kts
View file

@ -42,7 +42,6 @@ kotlin {
val androidHostTest by getting {
dependencies {
implementation(libs.junit)
implementation(project.dependencies.platform(libs.androidx.compose.bom))
implementation(libs.kotlinx.coroutines.test)
}
}

1
feature/map/build.gradle.kts
View file

@ -47,7 +47,6 @@ kotlin {
val androidHostTest by getting {
dependencies {
implementation(libs.junit)
implementation(project.dependencies.platform(libs.androidx.compose.bom))
implementation(libs.kotlinx.coroutines.test)
}
}

2
feature/widget/build.gradle.kts
View file

@ -33,7 +33,7 @@ dependencies {
implementation(projects.core.resources)
implementation(projects.core.repository)
implementation(libs.androidx.compose.ui) // LocalConfiguration, LocalDensity
implementation(libs.compose.multiplatform.ui) // LocalConfiguration, LocalDensity
implementation(libs.androidx.glance.appwidget)
implementation(libs.androidx.glance.material3)
implementation(libs.androidx.glance.preview)

2
gradle/libs.versions.toml
View file

@ -119,7 +119,7 @@ androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version
androidx-work-testing = { module = "androidx.work:work-testing", version = "2.11.2" }
# AndroidX Compose
androidx-compose-bom = { module = "androidx.compose:compose-bom", version = "2026.03.01" }
androidx-compose-bom = { module = "androidx.compose:compose-bom-alpha", version = "2026.03.01" }
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" }