From ef0ac5220d5dd4f266bafd7b88bb961dc01d24bb Mon Sep 17 00:00:00 2001 From: Phil Oliver <3497406+poliver@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:51:32 -0400 Subject: [PATCH] Consistent catalog naming for AndroidX dependencies (#3368) --- app/build.gradle.kts | 24 ++-- build-logic/convention/build.gradle.kts | 2 +- .../kotlin/AndroidRoomConventionPlugin.kt | 6 +- core/analytics/build.gradle.kts | 14 ++- core/common/build.gradle.kts | 2 +- core/data/build.gradle.kts | 2 +- core/model/build.gradle.kts | 3 +- core/prefs/build.gradle.kts | 2 +- core/proto/build.gradle.kts | 2 +- core/ui/build.gradle.kts | 4 +- feature/intro/build.gradle.kts | 4 +- feature/map/build.gradle.kts | 4 +- feature/settings/build.gradle.kts | 2 +- gradle/libs.versions.toml | 104 +++++++++--------- mesh_service_example/build.gradle.kts | 9 +- 15 files changed, 93 insertions(+), 91 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 83a86c9d2..6355e4180 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -207,12 +207,12 @@ dependencies { implementation(libs.androidx.compose.material3) implementation(libs.androidx.compose.material.iconsExtended) implementation(libs.androidx.compose.ui.tooling.preview) - implementation(libs.compose.runtime.livedata) + implementation(libs.androidx.compose.runtime.livedata) implementation(libs.androidx.compose.ui.text) - implementation(libs.lifecycle.livedata.ktx) - implementation(libs.lifecycle.process) - implementation(libs.lifecycle.viewmodel.compose) - implementation(libs.lifecycle.runtime.compose) + implementation(libs.androidx.lifecycle.livedata.ktx) + implementation(libs.androidx.lifecycle.process) + implementation(libs.androidx.lifecycle.viewmodel.compose) + implementation(libs.androidx.lifecycle.runtime.compose) implementation(libs.markdown.renderer) implementation(libs.markdown.renderer.android) implementation(libs.markdown.renderer.m3) @@ -220,30 +220,30 @@ dependencies { implementation(libs.coil) implementation(libs.coil.network.okhttp) implementation(libs.coil.svg) - implementation(libs.hilt.lifecycle.viewmodel.compose) + implementation(libs.androidx.hilt.lifecycle.viewmodel.compose) implementation(libs.zxing.android.embedded) { isTransitive = false } implementation(libs.zxing.core) - implementation(libs.core.splashscreen) - implementation(libs.emoji2.emojipicker) + implementation(libs.androidx.core.splashscreen) + implementation(libs.androidx.emoji2.emojipicker) implementation(libs.kotlinx.serialization.json) implementation(libs.org.eclipse.paho.client.mqttv3) implementation(libs.streamsupport.minifuture) implementation(libs.usb.serial.android) - implementation(libs.work.runtime.ktx) + implementation(libs.androidx.work.runtime.ktx) implementation(libs.accompanist.permissions) implementation(libs.timber) - debugImplementation(libs.androidx.compose.ui.testManifest) + debugImplementation(libs.androidx.compose.ui.test.manifest) googleImplementation(libs.location.services) fdroidImplementation(libs.osmdroid.android) fdroidImplementation(libs.osmdroid.geopackage) { exclude(group = "com.j256.ormlite") } - androidTestImplementation(libs.androidx.compose.ui.test) + androidTestImplementation(libs.androidx.compose.ui.test.junit4) androidTestImplementation(libs.androidx.test.runner) - testImplementation(libs.ext.junit) + testImplementation(libs.androidx.test.ext.junit) testImplementation(libs.junit) dokkaPlugin(libs.dokka.android.documentation.plugin) diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts index c19069a51..8f834eb0b 100644 --- a/build-logic/convention/build.gradle.kts +++ b/build-logic/convention/build.gradle.kts @@ -50,7 +50,7 @@ dependencies { compileOnly(libs.hilt.gradlePlugin) compileOnly(libs.kotlin.gradlePlugin) compileOnly(libs.ksp.gradlePlugin) - compileOnly(libs.room.gradlePlugin) + compileOnly(libs.androidx.room.gradlePlugin) compileOnly(libs.secrets.gradlePlugin) compileOnly(libs.spotless.gradlePlugin) compileOnly(libs.truth) diff --git a/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt index 746443e0e..a816fbf8b 100644 --- a/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt @@ -43,9 +43,9 @@ class AndroidRoomConventionPlugin : Plugin { } dependencies { - "implementation"(libs.findLibrary("room.runtime").get()) - "implementation"(libs.findLibrary("room.ktx").get()) - "ksp"(libs.findLibrary("room.compiler").get()) + "implementation"(libs.findLibrary("androidx.room.runtime").get()) + "implementation"(libs.findLibrary("androidx.room.ktx").get()) + "ksp"(libs.findLibrary("androidx.room.compiler").get()) "androidTestImplementation"(libs.findBundle("testing.room").get()) } } diff --git a/core/analytics/build.gradle.kts b/core/analytics/build.gradle.kts index 9cb2ad9a9..0ab0d1c25 100644 --- a/core/analytics/build.gradle.kts +++ b/core/analytics/build.gradle.kts @@ -22,13 +22,15 @@ plugins { } dependencies { - implementation(project(":core:prefs")) - implementation(project(":core:model")) + implementation(projects.core.model) + implementation(projects.core.prefs) + + implementation(libs.androidx.appcompat) + implementation(libs.androidx.hilt.lifecycle.viewmodel.compose) + implementation(libs.androidx.navigation.compose) + implementation(libs.androidx.lifecycle.process) implementation(libs.timber) - implementation(libs.appcompat) - implementation(libs.hilt.lifecycle.viewmodel.compose) - implementation(libs.navigation.compose) - implementation(libs.lifecycle.process) + googleImplementation(platform(libs.firebase.bom)) googleImplementation(libs.bundles.firebase) { /* diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index 73a41424b..b6fcd38c4 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -22,4 +22,4 @@ plugins { android { namespace = "org.meshtastic.core.common" } -dependencies { implementation(libs.core.ktx) } +dependencies { implementation(libs.androidx.core.ktx) } diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts index 0db09ac50..673be4448 100644 --- a/core/data/build.gradle.kts +++ b/core/data/build.gradle.kts @@ -34,7 +34,7 @@ dependencies { implementation(projects.core.prefs) implementation(projects.core.proto) - implementation(libs.core.location.altitude) + implementation(libs.androidx.core.location.altitude) implementation(libs.kotlinx.coroutines.android) implementation(libs.kotlinx.serialization.json) implementation(libs.timber) diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts index 983fe7c4c..9a28ce209 100644 --- a/core/model/build.gradle.kts +++ b/core/model/build.gradle.kts @@ -33,7 +33,8 @@ android { dependencies { implementation(projects.core.proto) implementation(projects.core.strings) - implementation(libs.annotation) + + implementation(libs.androidx.annotation) implementation(libs.timber) implementation(libs.zxing.android.embedded) { isTransitive = false } implementation(libs.zxing.core) diff --git a/core/prefs/build.gradle.kts b/core/prefs/build.gradle.kts index 58b95ea1d..350ea45fd 100644 --- a/core/prefs/build.gradle.kts +++ b/core/prefs/build.gradle.kts @@ -25,6 +25,6 @@ android { namespace = "org.meshtastic.core.prefs" } dependencies { implementation(libs.bundles.coroutines) - implementation(libs.appcompat) + implementation(libs.androidx.appcompat) googleImplementation(libs.maps.compose) } diff --git a/core/proto/build.gradle.kts b/core/proto/build.gradle.kts index 10bc12232..142880f8f 100644 --- a/core/proto/build.gradle.kts +++ b/core/proto/build.gradle.kts @@ -42,7 +42,7 @@ android { namespace = "org.meshtastic.core.proto" } // per protobuf-gradle-plugin docs, this is recommended for android protobuf { - protoc { artifact = libs.protoc.get().toString() } + protoc { artifact = libs.protobuf.protoc.get().toString() } generateProtoTasks { all().forEach { task -> task.builtins { diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index c17bb0fe1..6d0ad8885 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -35,6 +35,6 @@ dependencies { implementation(libs.bundles.markdown) implementation(libs.bundles.ui) - implementation(libs.emoji2.emojipicker) - implementation(libs.hilt.lifecycle.viewmodel.compose) + implementation(libs.androidx.emoji2.emojipicker) + implementation(libs.androidx.hilt.lifecycle.viewmodel.compose) } diff --git a/feature/intro/build.gradle.kts b/feature/intro/build.gradle.kts index dc5a1e045..67a7be709 100644 --- a/feature/intro/build.gradle.kts +++ b/feature/intro/build.gradle.kts @@ -29,6 +29,6 @@ dependencies { implementation(libs.bundles.ui) implementation(libs.accompanist.permissions) - implementation(libs.navigation3.runtime) - implementation(libs.navigation3.ui) + implementation(libs.androidx.navigation3.runtime) + implementation(libs.androidx.navigation3.ui) } diff --git a/feature/map/build.gradle.kts b/feature/map/build.gradle.kts index 79714097f..f0b56ccdc 100644 --- a/feature/map/build.gradle.kts +++ b/feature/map/build.gradle.kts @@ -44,7 +44,7 @@ dependencies { googleImplementation(libs.bundles.maps.compose) implementation(libs.accompanist.permissions) - implementation(libs.annotation) - implementation(libs.hilt.lifecycle.viewmodel.compose) + implementation(libs.androidx.annotation) + implementation(libs.androidx.hilt.lifecycle.viewmodel.compose) implementation(libs.timber) } diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts index e88167860..1a35c4582 100644 --- a/feature/settings/build.gradle.kts +++ b/feature/settings/build.gradle.kts @@ -40,7 +40,7 @@ dependencies { implementation(libs.bundles.ui) implementation(libs.accompanist.permissions) - implementation(libs.hilt.lifecycle.viewmodel.compose) + implementation(libs.androidx.hilt.lifecycle.viewmodel.compose) implementation(libs.kotlinx.collections.immutable) implementation(libs.timber) implementation(libs.zxing.android.embedded) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0b27b0ed1..389da56d6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -38,37 +38,37 @@ protobuf = "4.32.1" [libraries] # AndroidX -activity = { module = "androidx.activity:activity" } -activity-compose = { module = "androidx.activity:activity-compose" } -actvity-ktx = { module = "androidx.activity:activity-ktx" } -annotation = { module = "androidx.annotation:annotation", version = "1.9.1" } -appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } -appcompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "appcompat" } -constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.1" } -core-ktx = { module = "androidx.core:core-ktx", version = "1.17.0" } -core-location-altitude = { module = "androidx.core:core-location-altitude", version = "1.0.0-alpha03" } -core-splashscreen = { module = "androidx.core:core-splashscreen", version = "1.0.1" } -datastore = { module = "androidx.datastore:datastore", version.ref = "datastore" } -datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" } -emoji2-emojipicker = { module = "androidx.emoji2:emoji2-emojipicker", version = "1.6.0" } -hilt-lifecycle-viewmodel-compose = { module = "androidx.hilt:hilt-lifecycle-viewmodel-compose", version = "1.3.0" } -lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "lifecycle" } -lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" } -lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" } -lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle" } -lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" } -lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" } -lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" } -navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation" } -navigation-testing = { module = "androidx.navigation:navigation-testing", version.ref = "navigation" } -navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "navigation3" } -navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "navigation3" } -room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } -room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" } -room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } -room-testing = { module = "androidx.room:room-testing", version.ref = "room" } -tracing-ktx = { module = "androidx.tracing:tracing-ktx", version.ref = "androidxTracing" } -work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version = "2.10.5" } +androidx-activity = { module = "androidx.activity:activity" } +androidx-activity-compose = { module = "androidx.activity:activity-compose" } +androidx-activity-ktx = { module = "androidx.activity:activity-ktx" } +androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" } +androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } +androidx-appcompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "appcompat" } +androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.1" } +androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.17.0" } +androidx-core-location-altitude = { module = "androidx.core:core-location-altitude", version = "1.0.0-alpha03" } +androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version = "1.0.1" } +androidx-datastore = { module = "androidx.datastore:datastore", version.ref = "datastore" } +androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" } +androidx-emoji2-emojipicker = { module = "androidx.emoji2:emoji2-emojipicker", version = "1.6.0" } +androidx-hilt-lifecycle-viewmodel-compose = { module = "androidx.hilt:hilt-lifecycle-viewmodel-compose", version = "1.3.0" } +androidx-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "lifecycle" } +androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" } +androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" } +androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle" } +androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" } +androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" } +androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" } +androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation" } +androidx-navigation-testing = { module = "androidx.navigation:navigation-testing", version.ref = "navigation" } +androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "navigation3" } +androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "navigation3" } +androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } +androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" } +androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } +androidx-room-testing = { module = "androidx.room:room-testing", version.ref = "room" } +androidx-tracing-ktx = { module = "androidx.tracing:tracing-ktx", version.ref = "androidxTracing" } +androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version = "2.10.5" } # Compose accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } @@ -83,13 +83,13 @@ androidx-compose-material3-adaptive-layout = { module = "androidx.compose.materi androidx-compose-material3-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation", version.ref = "androidxComposeMaterial3Adaptive" } androidx-compose-material3-windowSizeClass = { module = "androidx.compose.material3:material3-window-size-class" } androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } +androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" } androidx-compose-runtime-tracing = { module = "androidx.compose.runtime:runtime-tracing", version.ref = "androidxTracing" } -androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test-junit4" } -androidx-compose-ui-testManifest = { module = "androidx.compose.ui:ui-test-manifest" } +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" } -compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" } # Google android-desugarJdkLibs = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.5" } @@ -105,7 +105,7 @@ maps-compose = { module = "com.google.maps.android:maps-compose", version.ref = maps-compose-utils = { module = "com.google.maps.android:maps-compose-utils", version.ref = "maps-compose" } maps-compose-widgets = { module = "com.google.maps.android:maps-compose-widgets", version.ref = "maps-compose" } protobuf-kotlin = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobuf" } -protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" } +protobuf-protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" } zxing-core = { module = "com.google.zxing:core", version = "3.5.3" } truth = { module = "com.google.truth:truth", version = "1.4.5" } @@ -126,9 +126,9 @@ ktorfit = { module = "de.jensklingenberg.ktorfit:ktorfit-lib", version.ref = "kt okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version = "5.1.0" } # Testing +androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version = "3.7.0" } +androidx-test-ext-junit = { module = "androidx.test.ext:junit", version = "1.3.0" } androidx-test-runner = { module = "androidx.test:runner", version = "1.7.0" } -espresso-core = { module = "androidx.test.espresso:espresso-core", version = "3.7.0" } -ext-junit = { module = "androidx.test.ext:junit", version = "1.3.0" } junit = { module = "junit:junit", version = "4.13.2" } # Other @@ -164,30 +164,30 @@ zxing-android-embedded = { module = "com.journeyapps:zxing-android-embedded", ve # Build Logic android-gradleApiPlugin = { module = "com.android.tools.build:gradle-api", version.ref = "agp" } android-tools-common = { module = "com.android.tools:common", version = "31.13.0" } -serialization-gradlePlugin = { module = "org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin", version.ref = "kotlin" } androidx-lint-gradle = { module = "androidx.lint:lint-gradle", version = "1.0.0-alpha05" } +androidx-room-gradlePlugin = { module = "androidx.room:room-gradle-plugin", version.ref = "room" } compose-gradlePlugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" } datadog-gradlePlugin = { module = "com.datadoghq.dd-sdk-android-gradle-plugin:com.datadoghq.dd-sdk-android-gradle-plugin.gradle.plugin", version = "1.21.0" } -detekt-gradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" } detekt-compose = { module = "io.nlopez.compose.rules:detekt", version = "0.4.27" } detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" } +detekt-gradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" } firebase-crashlytics-gradlePlugin = { module = "com.google.firebase:firebase-crashlytics-gradle", version = "3.0.6" } firebase-performance-gradlePlugin = { module = "com.google.firebase:perf-plugin", version = "2.0.1" } google-services-gradlePlugin = { module = "com.google.gms.google-services:com.google.gms.google-services.gradle.plugin", version = "4.4.3" } hilt-gradlePlugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" } ksp-gradlePlugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "devtools-ksp" } -room-gradlePlugin = { module = "androidx.room:room-gradle-plugin", version.ref = "room" } secrets-gradlePlugin = {module = "com.google.android.secrets-gradle-plugin:com.google.android.secrets-gradle-plugin.gradle.plugin", version = "1.1.0"} +serialization-gradlePlugin = { module = "org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin", version.ref = "kotlin" } spotless-gradlePlugin = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "8.0.0" } [bundles] # AndroidX -androidx = ["core-ktx", "appcompat", "appcompat-resources", "actvity-ktx", "activity-compose"] -datastore = ["datastore", "datastore-preferences"] -lifecycle = ["lifecycle-runtime-ktx", "lifecycle-livedata-ktx", "lifecycle-viewmodel-ktx", "lifecycle-common-java8", "lifecycle-process", "lifecycle-viewmodel-compose", "lifecycle-runtime-compose"] -navigation = ["navigation-compose"] -navigation3 = ["navigation3-runtime", "navigation3-ui"] -room = ["room-runtime", "room-ktx"] +androidx = ["androidx-core-ktx", "androidx-appcompat", "androidx-appcompat-resources", "androidx-activity-ktx", "androidx-activity-compose"] +datastore = ["androidx-datastore", "androidx-datastore-preferences"] +lifecycle = ["androidx-lifecycle-runtime-ktx", "androidx-lifecycle-livedata-ktx", "androidx-lifecycle-viewmodel-ktx", "androidx-lifecycle-common-java8", "androidx-lifecycle-process", "androidx-lifecycle-viewmodel-compose", "androidx-lifecycle-runtime-compose"] +navigation = ["androidx-navigation-compose"] +navigation3 = ["androidx-navigation3-runtime", "androidx-navigation3-ui"] +room = ["androidx-room-runtime", "androidx-room-ktx"] # Coroutines coroutines = ["kotlinx-coroutines-android", "kotlinx-coroutines-guava"] @@ -206,16 +206,16 @@ markdown = ["markdown-renderer", "markdown-renderer-m3", "markdown-renderer-andr osm = ["osmdroid-android", "osmbonuspack", "mgrs"] # Testing -testing = ["junit", "ext-junit"] -testing-android = ["espresso-core", "androidx-compose-ui-test"] -testing-android-manifest = ["androidx-compose-ui-testManifest"] +testing = ["junit", "androidx-test-ext-junit"] +testing-android = ["androidx-test-espresso-core", "androidx-compose-ui-test-junit4"] +testing-android-manifest = ["androidx-compose-ui-test-manifest"] testing-hilt = ["hilt-android-testing"] -testing-navigation = ["navigation-testing"] -testing-room = ["room-testing"] +testing-navigation = ["androidx-navigation-testing"] +testing-room = ["androidx-room-testing"] # UI adaptive = ["androidx-compose-material3-adaptive", "androidx-compose-material3-adaptive-layout", "androidx-compose-material3-adaptive-navigation", "androidx-compose-material3-navigationSuite"] -ui = ["material", "constraintlayout", "androidx-compose-material3", "androidx-compose-material-iconsExtended", "androidx-compose-ui-tooling-preview", "compose-runtime-livedata", "androidx-compose-ui-text"] +ui = ["material", "androidx-constraintlayout", "androidx-compose-material3", "androidx-compose-material-iconsExtended", "androidx-compose-ui-tooling-preview", "androidx-compose-runtime-livedata", "androidx-compose-ui-text"] ui-tooling = ["androidx-compose-ui-tooling"] #Separate for debugImplementation [plugins] diff --git a/mesh_service_example/build.gradle.kts b/mesh_service_example/build.gradle.kts index 11179b1dc..31490f210 100644 --- a/mesh_service_example/build.gradle.kts +++ b/mesh_service_example/build.gradle.kts @@ -55,12 +55,11 @@ dependencies { implementation(projects.core.proto) implementation(projects.core.service) - implementation(libs.appcompat) - implementation(libs.material) - implementation(libs.activity) - implementation(libs.constraintlayout) - + implementation(libs.androidx.activity) + implementation(libs.androidx.appcompat) + implementation(libs.androidx.constraintlayout) implementation(libs.kotlinx.serialization.json) + implementation(libs.material) // OSM implementation(libs.bundles.osm)