Merge pull request #848 from square/rick/dependency_cleanup_2

transitive dependency cleanup

benchmarks/dungeon-benchmark/build.gradle.kts

@@ -38,10 +38,10 @@ android {
 }
 
 dependencies {
-  implementation(libs.androidx.test.junit)
+  implementation(libs.androidx.macro.benchmark)
   implementation(libs.androidx.test.espresso.core)
+  implementation(libs.androidx.test.junit)
   implementation(libs.androidx.test.uiautomator)
-  implementation(libs.androidx.macro.benchmark)
 }
 
 androidComponents {

benchmarks/performance-poetry/complex-benchmark/build.gradle.kts

@@ -47,14 +47,14 @@ android {
 }
 
 dependencies {
+  implementation(libs.androidx.macro.benchmark)
+  implementation(libs.androidx.test.espresso.core)
+  implementation(libs.androidx.test.junit)
+  implementation(libs.androidx.test.uiautomator)
+
   implementation(project(":benchmarks:performance-poetry:complex-poetry"))
   implementation(project(":samples:containers:poetry"))
   implementation(project(":workflow-core"))
-
-  implementation(libs.androidx.test.junit)
-  implementation(libs.androidx.test.espresso.core)
-  implementation(libs.androidx.test.uiautomator)
-  implementation(libs.androidx.macro.benchmark)
 }
 
 androidComponents {

benchmarks/performance-poetry/complex-poetry/build.gradle.kts

@@ -46,23 +46,33 @@ android {
 }
 
 dependencies {
-  debugImplementation(libs.squareup.leakcanary.android)
+  androidTestImplementation(libs.androidx.test.espresso.core)
+  androidTestImplementation(libs.androidx.test.junit)
+
+  androidTestImplementation(project(":workflow-ui:internal-testing-android"))
 
   // API on an app module so these are transitive dependencies for the benchmarks.
   api(project(":samples:containers:android"))
+  api(project(":samples:containers:common"))
   api(project(":samples:containers:poetry"))
+  api(project(":workflow-core"))
+  api(project(":workflow-runtime"))
   api(project(":workflow-ui:core-android"))
+  api(project(":workflow-ui:core-common"))
+
+  debugImplementation(libs.squareup.leakcanary.android)
 
   implementation(libs.androidx.activity.ktx)
   implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.lifecycle.viewmodel.core)
+  implementation(libs.androidx.lifecycle.viewmodel.savedstate)
   // Used to side load Baseline Profile when Benchmarking and not installed by Play Store.
   implementation(libs.androidx.profileinstaller)
   implementation(libs.androidx.recyclerview)
+  implementation(libs.androidx.savedstate)
   implementation(libs.androidx.test.uiautomator)
+  implementation(libs.androidx.tracing.core)
   implementation(libs.androidx.tracing.ktx)
+  implementation(libs.kotlinx.coroutines.core)
   implementation(libs.timber)
-
-  androidTestImplementation(project(":workflow-ui:internal-testing-android"))
-  androidTestImplementation(libs.androidx.test.espresso.core)
-  androidTestImplementation(libs.androidx.test.junit)
 }

gradle/libs.versions.toml

@@ -9,6 +9,7 @@ targetSdk = "30"
 androidx-activity = "1.3.0"
 androidx-appcompat = "1.3.1"
 androidx-benchmark = "1.1.0-rc03"
+androidx-cardview = "1.0.0"
 androidx-compose = "1.1.0-rc01"
 androidx-compose-compiler = "1.1.0-rc02"
 androidx-constraintlayout = "2.1.2"
@@ -108,15 +109,22 @@ androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref
 
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
 
-androidx-macro-benchmark = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark" }
+androidx-cardview = { module = "androidx.cardview:cardview", version.ref = "androidx-cardview" }
 
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose" }
+androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidx-compose" }
 
 androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "androidx-compose" }
 
+androidx-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "androidx-compose" }
+androidx-compose-runtime-saveable = { module = "androidx.compose.runtime:runtime-saveable", version.ref = "androidx-compose" }
+
 androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose" }
+androidx-compose-ui-geometry = { module = "androidx.compose.ui:ui-geometry", version.ref = "androidx-compose" }
+androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics", version.ref = "androidx-compose" }
 androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-compose" }
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose" }
+androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose" }
 
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
 
@@ -127,12 +135,16 @@ androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref
 
 androidx-gridlayout = { module = "androidx.gridlayout:gridlayout", version.ref = "androidx-gridlayout" }
 
+androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-core = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-testing = { module = "androidx.lifecycle:lifecycle-runtime-testing", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel-core = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" }
 
+androidx-macro-benchmark = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark" }
+
 androidx-profileinstaller = { module = "androidx.profileinstaller:profileinstaller", version.ref = "androidx-profileinstaller" }
 
 androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "androidx-recyclerview" }
@@ -149,6 +161,7 @@ androidx-test-truth = { module = "androidx.test.ext:truth", version.ref = "andro
 
 androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.2.0"
 
+androidx-tracing-core = { module = "androidx.tracing:tracing", version.ref = "androidx-tracing" }
 androidx-tracing-ktx = { module = "androidx.tracing:tracing-ktx", version.ref = "androidx-tracing" }
 
 androidx-transition = { module = "androidx.transition:transition", version.ref = "androidx-transition" }
@@ -178,6 +191,7 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
 kotlin-serialization-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
 kotlin-test-annotations = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlin" }
 kotlin-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlin" }
+kotlin-test-core = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlin-test-jdk = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 
 kotlinx-binaryCompatibility-gradle-plugin = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version.ref = "kotlinx-binary-compatibility" }
@@ -196,12 +210,14 @@ ktlint-gradle = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref =
 lanterna = "com.googlecode.lanterna:lanterna:3.1.1"
 
 mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito-core" }
-
 mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito-kotlin" }
 
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 
+reactivestreams = "org.reactivestreams:reactive-streams:1.0.3"
+
 robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
+robolectric-annotations = { module = "org.robolectric:annotations", version.ref = "robolectric" }
 
 rxjava2-rxandroid = { module = "io.reactivex.rxjava2:rxandroid", version.ref = "rxjava2-android" }
 rxjava2-rxjava = { module = "io.reactivex.rxjava2:rxjava", version.ref = "rxjava2-core" }
@@ -212,6 +228,7 @@ squareup-cycler = { module = "com.squareup.cycler:cycler", version.ref = "square
 
 squareup-leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "squareup-leakcanary" }
 squareup-leakcanary-instrumentation = { module = "com.squareup.leakcanary:leakcanary-android-instrumentation", version.ref = "squareup-leakcanary" }
+squareup-leakcanary-objectwatcher-android = { module = "com.squareup.leakcanary:leakcanary-object-watcher-android-core", version.ref = "squareup-leakcanary" }
 
 squareup-moshi = { module = "com.squareup.moshi:moshi", version.ref = "squareup-moshi" }
 squareup-moshi-adapters = { module = "com.squareup.moshi:moshi-adapters", version.ref = "squareup-moshi" }

internal-testing-utils/build.gradle.kts

@@ -6,7 +6,8 @@ plugins {
 dependencies {
   implementation(libs.kotlin.jdk8)
 
-  testImplementation(libs.kotlin.test.jdk)
   testImplementation(libs.junit)
+  testImplementation(libs.kotlin.test.core)
+  testImplementation(libs.kotlin.test.jdk)
   testImplementation(libs.truth)
 }

samples/compose-samples/build.gradle.kts

@@ -19,26 +19,37 @@ android {
 }
 
 dependencies {
+  androidTestImplementation(libs.androidx.activity.core)
+  androidTestImplementation(libs.androidx.compose.ui)
+  androidTestImplementation(libs.androidx.compose.ui.test.junit4)
+  androidTestImplementation(libs.androidx.test.core)
+  androidTestImplementation(libs.androidx.test.truth)
+  androidTestImplementation(libs.kotlin.test.jdk)
+
+  androidTestImplementation(project(":workflow-runtime"))
+
   debugImplementation(libs.squareup.leakcanary.android)
 
-  implementation(project(":workflow-ui:compose"))
-  implementation(project(":workflow-ui:compose-tooling"))
-  implementation(project(":workflow-ui:core-android"))
   implementation(libs.androidx.activity.compose)
+  implementation(libs.androidx.activity.core)
+  implementation(libs.androidx.compose.foundation)
+  implementation(libs.androidx.compose.foundation.layout)
   implementation(libs.androidx.compose.material)
-  implementation(libs.androidx.compose.ui.tooling)
+  implementation(libs.androidx.compose.runtime)
   implementation(libs.androidx.compose.ui)
+  implementation(libs.androidx.compose.ui.geometry)
+  implementation(libs.androidx.compose.ui.graphics)
+  implementation(libs.androidx.compose.ui.tooling)
+  implementation(libs.androidx.compose.ui.tooling.preview)
   implementation(libs.androidx.lifecycle.viewmodel.ktx)
   implementation(libs.androidx.lifecycle.viewmodel.savedstate)
   implementation(libs.androidx.viewbinding)
+  implementation(libs.kotlin.common)
   // For the LayoutInspector.
   implementation(libs.kotlin.reflect)
 
-  androidTestImplementation(project(":workflow-runtime"))
-  androidTestImplementation(libs.androidx.activity.core)
-  androidTestImplementation(libs.androidx.compose.ui)
-  androidTestImplementation(libs.kotlin.test.jdk)
-  androidTestImplementation(libs.androidx.test.core)
-  androidTestImplementation(libs.androidx.test.truth)
-  androidTestImplementation(libs.androidx.compose.ui.test.junit4)
+  implementation(project(":workflow-ui:compose"))
+  implementation(project(":workflow-ui:compose-tooling"))
+  implementation(project(":workflow-ui:core-android"))
+  implementation(project(":workflow-ui:core-common"))
 }

samples/containers/android/build.gradle.kts

@@ -11,23 +11,23 @@ android {
 }
 
 dependencies {
-  api(project(":workflow-core"))
-  api(project(":workflow-ui:container-android"))
-  api(project(":samples:containers:common"))
+  androidTestImplementation(libs.androidx.activity.core)
+  androidTestImplementation(libs.androidx.compose.ui)
+  androidTestImplementation(libs.androidx.compose.ui.test.junit4)
+  androidTestImplementation(libs.androidx.test.core)
+  androidTestImplementation(libs.androidx.test.truth)
+  androidTestImplementation(libs.kotlin.test.jdk)
 
   api(libs.androidx.transition)
   api(libs.kotlin.jdk6)
 
-  implementation(project(":workflow-runtime"))
+  api(project(":samples:containers:common"))
+  api(project(":workflow-ui:core-android"))
+  api(project(":workflow-ui:core-common"))
+
   implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.core)
   implementation(libs.androidx.savedstate)
   implementation(libs.kotlinx.coroutines.android)
   implementation(libs.kotlinx.coroutines.core)
-
-  androidTestImplementation(libs.androidx.activity.core)
-  androidTestImplementation(libs.androidx.compose.ui)
-  androidTestImplementation(libs.kotlin.test.jdk)
-  androidTestImplementation(libs.androidx.test.core)
-  androidTestImplementation(libs.androidx.test.truth)
-  androidTestImplementation(libs.androidx.compose.ui.test.junit4)
 }

samples/containers/app-poetry/build.gradle.kts

@@ -14,10 +14,9 @@ android {
 dependencies {
   debugImplementation(libs.squareup.leakcanary.android)
 
-  implementation(project(":samples:containers:android"))
-  implementation(project(":samples:containers:poetry"))
-  implementation(project(":workflow-ui:core-android"))
-
   implementation(libs.androidx.activity.ktx)
   implementation(libs.androidx.recyclerview)
+
+  implementation(project(":samples:containers:android"))
+  implementation(project(":samples:containers:poetry"))
 }

samples/containers/app-raven/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
   debugImplementation(libs.squareup.leakcanary.android)
 
   implementation(libs.androidx.activity.ktx)
+
   implementation(project(":samples:containers:android"))
   implementation(project(":samples:containers:poetry"))
-  implementation(project(":workflow-ui:core-android"))
 }

samples/containers/common/build.gradle.kts

@@ -3,14 +3,12 @@ plugins {
 }
 
 dependencies {
-  implementation(project(":workflow-ui:container-common"))
-  implementation(project(":workflow-core"))
+  api(project(":workflow-ui:core-common"))
 
   implementation(libs.kotlin.jdk6)
 
-  testImplementation(libs.kotlin.test.jdk)
   testImplementation(libs.hamcrest)
   testImplementation(libs.junit)
+  testImplementation(libs.kotlin.test.jdk)
   testImplementation(libs.truth)
-  testImplementation(project(":workflow-testing"))
 }

samples/containers/hello-back-button/build.gradle.kts

@@ -15,7 +15,10 @@ android {
 dependencies {
   debugImplementation(libs.squareup.leakcanary.android)
 
+  implementation(libs.androidx.activity.ktx)
+
   implementation(project(":samples:containers:android"))
+  implementation(project(":workflow-ui:container-android"))
   implementation(project(":workflow-ui:core-android"))
-  implementation(libs.androidx.activity.ktx)
+  implementation(project(":workflow-ui:core-common"))
 }

samples/containers/poetry/build.gradle.kts

@@ -5,23 +5,24 @@ plugins {
 }
 
 dependencies {
-  api(project(":workflow-core"))
-  api(project(":workflow-ui:container-android"))
-  api(project(":samples:containers:common"))
-
   api(libs.androidx.transition)
   api(libs.kotlin.jdk6)
 
-  implementation(project(":samples:containers:android"))
-  implementation(project(":workflow-runtime"))
+  api(project(":samples:containers:common"))
+  api(project(":workflow-core"))
+  api(project(":workflow-ui:core-android"))
+  api(project(":workflow-ui:core-common"))
+
   implementation(libs.androidx.appcompat)
   implementation(libs.androidx.recyclerview)
   implementation(libs.androidx.savedstate)
   implementation(libs.kotlinx.coroutines.android)
   implementation(libs.kotlinx.coroutines.core)
   implementation(libs.timber)
 
+  implementation(project(":samples:containers:android"))
+
   testImplementation(libs.junit)
-  testImplementation(libs.truth)
   testImplementation(libs.kotlinx.coroutines.test)
+  testImplementation(libs.truth)
 }

samples/dungeon/app/build.gradle.kts

@@ -22,27 +22,36 @@ android {
 }
 
 dependencies {
-  debugImplementation(libs.squareup.leakcanary.android)
+  androidTestImplementation(libs.androidx.test.uiautomator)
+  androidTestImplementation(libs.squareup.leakcanary.instrumentation)
 
-  implementation(project(":samples:dungeon:common"))
-  implementation(project(":samples:dungeon:timemachine-shakeable"))
-  implementation(project(":workflow-ui:container-android"))
-  implementation(project(":workflow-tracing"))
+  debugImplementation(libs.squareup.leakcanary.android)
 
   implementation(libs.androidx.activity.ktx)
+  implementation(libs.androidx.cardview)
   implementation(libs.androidx.constraintlayout)
+  implementation(libs.androidx.core)
+  implementation(libs.androidx.gridlayout)
   // Used to side load Baseline Profile when Benchmarking.
   implementation(libs.androidx.profileinstaller)
+  implementation(libs.androidx.recyclerview)
   implementation(libs.google.android.material)
-  implementation(libs.androidx.gridlayout)
+  implementation(libs.kotlin.common)
+  implementation(libs.kotlinx.coroutines.core)
   implementation(libs.kotlinx.coroutines.rx2)
-  implementation(libs.squareup.okio)
   implementation(libs.rxjava2.rxandroid)
   implementation(libs.squareup.cycler)
+  implementation(libs.squareup.okio)
+
+  implementation(project(":samples:dungeon:common"))
+  implementation(project(":samples:dungeon:timemachine"))
+  implementation(project(":samples:dungeon:timemachine-shakeable"))
+  implementation(project(":workflow-tracing"))
+  implementation(project(":workflow-ui:container-android"))
+  implementation(project(":workflow-ui:container-common"))
+  implementation(project(":workflow-ui:core-android"))
+  implementation(project(":workflow-ui:core-common"))
 
   testImplementation(libs.junit)
   testImplementation(libs.truth)
-
-  androidTestImplementation(libs.squareup.leakcanary.instrumentation)
-  androidTestImplementation(libs.androidx.test.uiautomator)
 }