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

Consistent catalog naming for AndroidX dependencies (#3368)

Browse source
This commit is contained in:
Phil Oliver 2025-10-06 23:51:32 -04:00 • committed by GitHub
parent ec81101a31
commit ef0ac5220d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 93 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/analytics/build.gradle.kts
View file

@ -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) {
/*

2
core/common/build.gradle.kts
View file

@ -22,4 +22,4 @@ plugins {
android { namespace = "org.meshtastic.core.common" }
dependencies { implementation(libs.core.ktx) }
dependencies { implementation(libs.androidx.core.ktx) }

2
core/data/build.gradle.kts
View file

@ -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)

3
core/model/build.gradle.kts
View file

@ -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)

2
core/prefs/build.gradle.kts
View file

@ -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)
}

2
core/proto/build.gradle.kts
View file

@ -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 {

4
core/ui/build.gradle.kts
View file

@ -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)
}