From da65dfdd1547afaf31e368aa79d75910b287d25b Mon Sep 17 00:00:00 2001 From: Phil Oliver <3497406+poliver@users.noreply.github.com> Date: Tue, 7 Oct 2025 20:08:48 -0400 Subject: [PATCH] Remove remaining unused dependencies in `:core:*` (#3387) --- build.gradle.kts | 5 +++++ core/model/build.gradle.kts | 2 +- core/network/build.gradle.kts | 9 --------- core/prefs/build.gradle.kts | 1 - core/service/build.gradle.kts | 6 ++---- core/ui/build.gradle.kts | 11 ++--------- gradle/libs.versions.toml | 3 ++- 7 files changed, 12 insertions(+), 25 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b3a9ef467..45e605d72 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -102,6 +102,11 @@ dependencyAnalysis { includeDependency("com.google.dagger:hilt-core") includeDependency(libs.hilt.android) } + + bundle("ktorfit") { + includeDependency("de.jensklingenberg.ktorfit:ktorfit-lib") + includeDependency("de.jensklingenberg.ktorfit:ktorfit-annotations") + } } issues { diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts index f4b24a7e5..0a44105ed 100644 --- a/core/model/build.gradle.kts +++ b/core/model/build.gradle.kts @@ -40,7 +40,7 @@ dependencies { implementation(libs.zxing.core) testImplementation(libs.androidx.core.ktx) - testImplementation(libs.kotlin.test) + testImplementation(libs.junit) androidTestImplementation(libs.androidx.test.ext.junit) } diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts index 86dcaa587..a3d9ef413 100644 --- a/core/network/build.gradle.kts +++ b/core/network/build.gradle.kts @@ -33,7 +33,6 @@ android { dependencies { implementation(projects.core.model) - implementation(libs.coil) implementation(libs.coil.network.core) implementation(libs.coil.network.okhttp) implementation(libs.coil.svg) @@ -44,13 +43,5 @@ dependencies { 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) } diff --git a/core/prefs/build.gradle.kts b/core/prefs/build.gradle.kts index 75e31350c..276a63475 100644 --- a/core/prefs/build.gradle.kts +++ b/core/prefs/build.gradle.kts @@ -24,7 +24,6 @@ plugins { android { namespace = "org.meshtastic.core.prefs" } dependencies { - implementation(libs.androidx.appcompat) implementation(libs.kotlinx.coroutines.android) googleImplementation(libs.maps.compose) } diff --git a/core/service/build.gradle.kts b/core/service/build.gradle.kts index df5d77452..458db23ba 100644 --- a/core/service/build.gradle.kts +++ b/core/service/build.gradle.kts @@ -15,10 +15,7 @@ * along with this program. If not, see . */ -plugins { - alias(libs.plugins.meshtastic.android.library) - alias(libs.plugins.meshtastic.hilt) -} +plugins { alias(libs.plugins.meshtastic.android.library) } android { buildFeatures { aidl = true } @@ -29,6 +26,7 @@ dependencies { implementation(projects.core.database) implementation(projects.core.model) implementation(projects.core.proto) + implementation(libs.javax.inject) implementation(libs.kotlinx.coroutines.android) implementation(libs.timber) } diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 095cbdd0d..114382299 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -26,24 +26,17 @@ android { namespace = "org.meshtastic.core.ui" } dependencies { implementation(projects.core.database) implementation(projects.core.model) - implementation(projects.core.navigation) implementation(projects.core.prefs) implementation(projects.core.proto) implementation(projects.core.strings) + implementation(libs.androidx.activity.compose) 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.androidx.navigation.compose) + implementation(libs.guava) 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) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d1366d1b1..72d6c092a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -98,6 +98,7 @@ firebase-analytics = { module = "com.google.firebase:firebase-analytics" } firebase-bom = { module = "com.google.firebase:firebase-bom", version = "34.3.0" } firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" } firebase-performance = { module = "com.google.firebase:firebase-perf" } +guava = { module = "com.google.guava:guava", version = "33.5.0-jre" } hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" } hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" } hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } @@ -115,7 +116,6 @@ kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", ve kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.4.0" } kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines-android" } -kotlinx-coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava", version.ref = "kotlinx-coroutines-android" } kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } @@ -148,6 +148,7 @@ dd-sdk-android-timber = { module = "com.datadoghq:dd-sdk-android-timber", versio dd-sdk-android-trace = { module = "com.datadoghq:dd-sdk-android-trace", version.ref = "dd-sdk-android" } dd-sdk-android-trace-otel = { module = "com.datadoghq:dd-sdk-android-trace-otel", version.ref = "dd-sdk-android" } dokka-android-documentation-plugin = { module = "org.jetbrains.dokka:android-documentation-plugin", version = "2.0.0" } +javax-inject = { module = "javax.inject:javax.inject", version = "1" } markdown-renderer = { module = "com.mikepenz:multiplatform-markdown-renderer", version.ref = "markdownRenderer" } markdown-renderer-m3 = { module = "com.mikepenz:multiplatform-markdown-renderer-m3", version.ref = "markdownRenderer" } markdown-renderer-android = { module = "com.mikepenz:multiplatform-markdown-renderer-android", version.ref = "markdownRenderer" }