Remove version catalog bundles (#3370)

This commit is contained in:
Phil Oliver 2025-10-07 06:23:12 -04:00 committed by GitHub
parent 7287ebbf49
commit 59916a4cbe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 99 additions and 76 deletions

View file

@ -31,20 +31,18 @@ dependencies {
implementation(libs.androidx.lifecycle.process)
implementation(libs.timber)
googleImplementation(libs.dd.sdk.android.compose)
googleImplementation(libs.dd.sdk.android.logs)
googleImplementation(libs.dd.sdk.android.okhttp)
googleImplementation(libs.dd.sdk.android.rum)
googleImplementation(libs.dd.sdk.android.session.replay)
googleImplementation(libs.dd.sdk.android.session.replay.compose)
googleImplementation(libs.dd.sdk.android.timber)
googleImplementation(libs.dd.sdk.android.trace)
googleImplementation(libs.dd.sdk.android.trace.otel)
googleImplementation(platform(libs.firebase.bom))
googleImplementation(libs.bundles.firebase) {
/*
Exclusion of protobuf / protolite dependencies is necessary as the
datastore-proto brings in protobuf dependencies. These are the source of truth
for Now in Android.
That's why the duplicate classes from below dependencies are excluded.
*/
exclude(group = "com.google.protobuf", module = "protobuf-java")
exclude(group = "com.google.protobuf", module = "protobuf-kotlin")
exclude(group = "com.google.protobuf", module = "protobuf-javalite")
exclude(group = "com.google.firebase", module = "protolite-well-known-types")
}
googleImplementation(libs.bundles.datadog)
googleImplementation(libs.firebase.analytics)
googleImplementation(libs.firebase.crashlytics)
}
val googleServiceKeywords = listOf("crashlytics", "google", "datadog")

View file

@ -27,7 +27,8 @@ android { namespace = "org.meshtastic.core.datastore" }
dependencies {
implementation(projects.core.proto)
implementation(libs.bundles.datastore)
implementation(libs.androidx.datastore)
implementation(libs.androidx.datastore.preferences)
implementation(libs.kotlinx.serialization.json)
implementation(libs.timber)
}

View file

@ -32,8 +32,25 @@ android {
dependencies {
implementation(projects.core.model)
implementation(libs.bundles.ktor)
implementation(libs.bundles.coil)
"googleImplementation"(libs.bundles.datadog)
implementation(libs.coil)
implementation(libs.coil.network.core)
implementation(libs.coil.network.okhttp)
implementation(libs.coil.svg)
implementation(libs.kotlinx.serialization.json)
implementation(libs.ktor.client.content.negotiation)
implementation(libs.ktor.client.okhttp)
implementation(libs.ktor.serialization.kotlinx.json)
implementation(libs.ktorfit)
implementation(libs.okhttp3.logging.interceptor)
googleImplementation(libs.dd.sdk.android.compose)
googleImplementation(libs.dd.sdk.android.logs)
googleImplementation(libs.dd.sdk.android.okhttp)
googleImplementation(libs.dd.sdk.android.rum)
googleImplementation(libs.dd.sdk.android.session.replay)
googleImplementation(libs.dd.sdk.android.session.replay.compose)
googleImplementation(libs.dd.sdk.android.timber)
googleImplementation(libs.dd.sdk.android.trace)
googleImplementation(libs.dd.sdk.android.trace.otel)
}

View file

@ -24,7 +24,7 @@ plugins {
android { namespace = "org.meshtastic.core.prefs" }
dependencies {
implementation(libs.bundles.coroutines)
implementation(libs.androidx.appcompat)
implementation(libs.kotlinx.coroutines.android)
googleImplementation(libs.maps.compose)
}

View file

@ -31,10 +31,18 @@ dependencies {
implementation(projects.core.proto)
implementation(projects.core.strings)
implementation(libs.bundles.coroutines)
implementation(libs.bundles.markdown)
implementation(libs.bundles.ui)
implementation(libs.androidx.compose.material.iconsExtended)
implementation(libs.androidx.compose.material3)
implementation(libs.androidx.compose.runtime.livedata)
implementation(libs.androidx.compose.ui.text)
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.constraintlayout)
implementation(libs.androidx.emoji2.emojipicker)
implementation(libs.androidx.hilt.lifecycle.viewmodel.compose)
implementation(libs.kotlinx.coroutines.android)
implementation(libs.kotlinx.coroutines.guava)
implementation(libs.markdown.renderer)
implementation(libs.markdown.renderer.m3)
implementation(libs.markdown.renderer.android)
implementation(libs.material)
}