Fix dependencies of base-ui (#1288)

google · May 17, 2023 · d6b39f1 · d6b39f1
1 parent 3469e1c
commit d6b39f1
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 17 deletions.
diff --git a/base-ui/build.gradle.kts b/base-ui/build.gradle.kts
@@ -20,6 +20,7 @@ plugins {
     id("com.android.library")
     id("org.jetbrains.dokka")
     id("me.tylerbwong.gradle.metalava")
+    alias(libs.plugins.dependencyAnalysis)
     kotlin("android")
 }
 
@@ -94,32 +95,50 @@ metalava {
 dependencies {
     api(projects.annotations)
 
-    implementation(projects.composeLayout)
-    implementation(libs.kotlin.stdlib)
-    implementation(libs.androidx.wear)
-    implementation(libs.androidx.lifecycle.runtime)
-    implementation(libs.wearcompose.material)
-    implementation(libs.wearcompose.foundation)
-    implementation(libs.compose.material.iconscore)
-    implementation(libs.compose.material.iconsext)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    api(libs.compose.foundation.foundation)
+    api(libs.compose.foundation.foundation.layout)
+    api(libs.compose.runtime)
+    api(libs.compose.ui)
+    api(libs.compose.ui.graphics)
+    api(libs.wearcompose.material)
+    api(libs.wearcompose.foundation)
 
+    implementation(libs.androidx.annotation)
+    implementation(libs.compose.material.iconscore)
+    implementation(libs.compose.ui.text)
+    implementation(libs.compose.ui.unit)
     implementation(libs.coil)
-    implementation(libs.androidx.palette.ktx)
+    implementation(libs.coil.base)
+    implementation(libs.kotlin.stdlib)
 
-    implementation(libs.compose.ui.toolingpreview)
-    debugImplementation(libs.compose.ui.tooling)
-    debugImplementation(projects.composeTools)
+    debugApi(projects.composeTools)
+    debugApi(libs.wearcompose.tooling)
 
-    debugImplementation(libs.compose.ui.test.manifest)
+    debugImplementation(libs.compose.material.iconsext)
+    debugImplementation(libs.compose.ui.toolingpreview)
+    debugRuntimeOnly(libs.compose.ui.tooling)
+    debugRuntimeOnly(libs.compose.ui.test.manifest)
 
+    testImplementation(projects.composeTools)
+    testImplementation(projects.roboscreenshots)
     testImplementation(libs.accompanist.testharness)
+    testImplementation(libs.androidx.core)
+    testImplementation(libs.compose.material.iconsext)
+    testImplementation(libs.compose.ui.test)
+    testImplementation(libs.compose.ui.test.junit4)
     testImplementation(libs.junit)
-    testImplementation(libs.androidx.test.ext.ktx)
     testImplementation(libs.kotlinx.coroutines.test)
-    testImplementation(libs.truth)
-    testImplementation(projects.roboscreenshots)
     testImplementation(libs.robolectric)
+    testRuntimeOnly(libs.compose.ui.test.manifest)
+}
+
+dependencyAnalysis {
+    issues {
+        onAny {
+            severity("fail")
+            exclude(":annotations") // bug: reported as unused
+        }
+    }
 }
 
 apply(plugin = "com.vanniktech.maven.publish")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -74,6 +74,7 @@ androidx-complications-datasource-ktx = { module = "androidx.wear.watchface:watc
 androidx-complications-rendering = { module = "androidx.wear.watchface:watchface-complications-rendering", version.ref = "androidx-wear-watchface" }
 androidx-concurrent-future = { module = "androidx.concurrent:concurrent-futures", version.ref = "androidx-concurrent" }
 androidx-concurrent-future-ktx = { module = "androidx.concurrent:concurrent-futures-ktx", version.ref = "androidx-concurrent" }
+androidx-core = { module = "androidx.core:core", version.ref = "androidxCore" }
 androidx-corektx = { module = "androidx.core:core-ktx", version.ref = "androidxCore" }
 androidx-datastore = { module = "androidx.datastore:datastore", version.ref = "androidx-datastore" }
 androidx-datastore-core = { module = "androidx.datastore:datastore-core", version.ref = "androidx-datastore" }
@@ -139,6 +140,7 @@ compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics", version.ref = "compose" }
 compose-ui-text = { module = "androidx.compose.ui:ui-text", version.ref = "compose" }
 compose-ui-unit = { module = "androidx.compose.ui:ui-unit", version.ref = "compose" }
+compose-ui-test = { module = "androidx.compose.ui:ui-test", version.ref = "compose" }
 compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
 compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }