From 185c3ab5eb8b304e38c83acfe2207b0e6a53968c Mon Sep 17 00:00:00 2001
From: Phil Oliver <3497406+poliver@users.noreply.github.com>
Date: Tue, 7 Oct 2025 17:37:03 -0400
Subject: [PATCH]  Remove unused `:core:database` dependencies (#3383)

---
 app/build.gradle.kts                                       | 1 +
 .../src/main/kotlin/AndroidLibraryConventionPlugin.kt      | 5 -----
 .../src/main/kotlin/AndroidRoomConventionPlugin.kt         | 1 -
 .../convention/src/main/kotlin/HiltConventionPlugin.kt     | 1 -
 build.gradle.kts                                           | 7 +++++++
 core/database/build.gradle.kts                             | 3 +++
 core/model/build.gradle.kts                                | 2 ++
 feature/settings/build.gradle.kts                          | 3 +++
 8 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8ae25d559..392407038 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -250,6 +250,7 @@ dependencies {
 
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
     androidTestImplementation(libs.androidx.test.runner)
+    androidTestImplementation(libs.hilt.android.testing)
 
     testImplementation(libs.androidx.test.ext.junit)
     testImplementation(libs.junit)
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
index 48db986b9..128ccd98e 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -48,11 +48,6 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
             extensions.configure<LibraryAndroidComponentsExtension> {
                 disableUnnecessaryAndroidTests(target)
             }
-            dependencies {
-                "androidTestImplementation"(libs.findLibrary("kotlin.test").get())
-                "androidTestImplementation"(libs.findLibrary("androidx-test-espresso-core").get())
-                "androidTestImplementation"(libs.findLibrary("androidx-compose-ui-test-junit4").get())
-            }
         }
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt
index 89433bf60..9606318ba 100644
--- a/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt
@@ -44,7 +44,6 @@ class AndroidRoomConventionPlugin : Plugin<Project> {
 
             dependencies {
                 "implementation"(libs.findLibrary("androidx.room.runtime").get())
-                "implementation"(libs.findLibrary("androidx.room.ktx").get())
                 "ksp"(libs.findLibrary("androidx.room.compiler").get())
                 "androidTestImplementation"(libs.findLibrary("androidx-room-testing").get())
             }
diff --git a/build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt b/build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt
index 2b4df504e..6978a5319 100644
--- a/build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt
@@ -29,7 +29,6 @@ class HiltConventionPlugin : Plugin<Project> {
             dependencies {
                 "ksp"(libs.findLibrary("hilt.compiler").get())
                 "implementation"(libs.findLibrary("hilt-android").get())
-                "androidTestImplementation"(libs.findLibrary("hilt-android-testing").get())
             }
 
             // Add support for Jvm Module, base on org.jetbrains.kotlin.jvm
diff --git a/build.gradle.kts b/build.gradle.kts
index 00ddba098..b3a9ef467 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -95,6 +95,13 @@ dependencies {
 dependencyAnalysis {
     structure {
         ignoreKtx(true)
+
+        // Hilt Android is required by the Hilt plugin, but isn't directly used in many cases. Group
+        // these dependencies together so warnings aren't triggered.
+        bundle("hilt-core") {
+            includeDependency("com.google.dagger:hilt-core")
+            includeDependency(libs.hilt.android)
+        }
     }
 
     issues {
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
index df4748020..ae347b804 100644
--- a/core/database/build.gradle.kts
+++ b/core/database/build.gradle.kts
@@ -34,6 +34,9 @@ dependencies {
     implementation(projects.core.model)
     implementation(projects.core.proto)
     implementation(projects.core.strings)
+
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.timber)
+
+    androidTestImplementation(libs.androidx.test.ext.junit)
 }
diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts
index 14d3a591e..f4b24a7e5 100644
--- a/core/model/build.gradle.kts
+++ b/core/model/build.gradle.kts
@@ -41,4 +41,6 @@ dependencies {
 
     testImplementation(libs.androidx.core.ktx)
     testImplementation(libs.kotlin.test)
+
+    androidTestImplementation(libs.androidx.test.ext.junit)
 }
diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts
index ca2b13264..87a64a6f2 100644
--- a/feature/settings/build.gradle.kts
+++ b/feature/settings/build.gradle.kts
@@ -50,4 +50,7 @@ dependencies {
     implementation(libs.material)
     implementation(libs.timber)
     implementation(libs.zxing.android.embedded)
+
+    androidTestImplementation(libs.androidx.compose.ui.test.junit4)
+    androidTestImplementation(libs.androidx.test.ext.junit)
 }