From af41667275cefe2195a35f168bccebbf8a8f6ec9 Mon Sep 17 00:00:00 2001 From: Rick Busarow Date: Fri, 29 Jul 2022 12:41:21 -0500 Subject: [PATCH 1/2] sort all dependency declarations --- benchmarks/dungeon-benchmark/build.gradle.kts | 4 +-- .../complex-benchmark/build.gradle.kts | 10 +++---- .../complex-poetry/build.gradle.kts | 11 ++++---- internal-testing-utils/build.gradle.kts | 2 +- samples/compose-samples/build.gradle.kts | 24 +++++++++-------- samples/containers/android/build.gradle.kts | 21 ++++++++------- .../containers/app-poetry/build.gradle.kts | 6 ++--- samples/containers/app-raven/build.gradle.kts | 1 + samples/containers/common/build.gradle.kts | 9 ++++--- .../hello-back-button/build.gradle.kts | 3 ++- samples/containers/poetry/build.gradle.kts | 15 ++++++----- samples/dungeon/app/build.gradle.kts | 20 +++++++------- samples/dungeon/common/build.gradle.kts | 11 ++++---- .../timemachine-shakeable/build.gradle.kts | 3 ++- samples/dungeon/timemachine/build.gradle.kts | 7 ++--- .../terminal-workflow/build.gradle.kts | 4 +-- .../hello-workflow-fragment/build.gradle.kts | 4 +-- samples/hello-workflow/build.gradle.kts | 4 +-- samples/stub-visibility/build.gradle.kts | 4 +-- samples/tictactoe/app/build.gradle.kts | 26 +++++++++---------- samples/tictactoe/common/build.gradle.kts | 7 ++--- samples/todo-android/app/build.gradle.kts | 22 ++++++++-------- trace-encoder/build.gradle.kts | 12 ++++----- workflow-core/build.gradle.kts | 2 +- workflow-runtime/build.gradle.kts | 8 +++--- workflow-rx2/build.gradle.kts | 10 ++++--- workflow-testing/build.gradle.kts | 10 ++++--- workflow-tracing/build.gradle.kts | 11 ++++---- workflow-ui/compose-tooling/build.gradle.kts | 15 ++++++----- workflow-ui/compose/build.gradle.kts | 24 +++++++++-------- .../container-android/build.gradle.kts | 23 ++++++++-------- workflow-ui/container-common/build.gradle.kts | 3 ++- workflow-ui/core-android/build.gradle.kts | 22 ++++++++-------- workflow-ui/core-common/build.gradle.kts | 2 +- .../internal-testing-android/build.gradle.kts | 4 +-- .../internal-testing-compose/build.gradle.kts | 3 ++- workflow-ui/radiography/build.gradle.kts | 15 ++++++----- 37 files changed, 205 insertions(+), 177 deletions(-) diff --git a/benchmarks/dungeon-benchmark/build.gradle.kts b/benchmarks/dungeon-benchmark/build.gradle.kts index dcbb8318f..df53d0e9d 100644 --- a/benchmarks/dungeon-benchmark/build.gradle.kts +++ b/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 { diff --git a/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts b/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts index 661779649..318df7374 100644 --- a/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts +++ b/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 { diff --git a/benchmarks/performance-poetry/complex-poetry/build.gradle.kts b/benchmarks/performance-poetry/complex-poetry/build.gradle.kts index 1b141a7fb..04430740b 100644 --- a/benchmarks/performance-poetry/complex-poetry/build.gradle.kts +++ b/benchmarks/performance-poetry/complex-poetry/build.gradle.kts @@ -46,13 +46,18 @@ 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:poetry")) api(project(":workflow-ui:core-android")) + debugImplementation(libs.squareup.leakcanary.android) + implementation(libs.androidx.activity.ktx) implementation(libs.androidx.appcompat) // Used to side load Baseline Profile when Benchmarking and not installed by Play Store. @@ -61,8 +66,4 @@ dependencies { implementation(libs.androidx.test.uiautomator) implementation(libs.androidx.tracing.ktx) implementation(libs.timber) - - androidTestImplementation(project(":workflow-ui:internal-testing-android")) - androidTestImplementation(libs.androidx.test.espresso.core) - androidTestImplementation(libs.androidx.test.junit) } diff --git a/internal-testing-utils/build.gradle.kts b/internal-testing-utils/build.gradle.kts index 7f0cd8e3e..ffe0e0a09 100644 --- a/internal-testing-utils/build.gradle.kts +++ b/internal-testing-utils/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { implementation(libs.kotlin.jdk8) - testImplementation(libs.kotlin.test.jdk) testImplementation(libs.junit) + testImplementation(libs.kotlin.test.jdk) testImplementation(libs.truth) } diff --git a/samples/compose-samples/build.gradle.kts b/samples/compose-samples/build.gradle.kts index c7ee68f31..147e78676 100644 --- a/samples/compose-samples/build.gradle.kts +++ b/samples/compose-samples/build.gradle.kts @@ -19,26 +19,28 @@ 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.compose.material) - implementation(libs.androidx.compose.ui.tooling) implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.ui.tooling) implementation(libs.androidx.lifecycle.viewmodel.ktx) implementation(libs.androidx.lifecycle.viewmodel.savedstate) implementation(libs.androidx.viewbinding) // 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")) } diff --git a/samples/containers/android/build.gradle.kts b/samples/containers/android/build.gradle.kts index 693787712..d2f22d617 100644 --- a/samples/containers/android/build.gradle.kts +++ b/samples/containers/android/build.gradle.kts @@ -11,23 +11,24 @@ 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-core")) + api(project(":workflow-ui:container-android")) + implementation(libs.androidx.appcompat) 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) + implementation(project(":workflow-runtime")) } diff --git a/samples/containers/app-poetry/build.gradle.kts b/samples/containers/app-poetry/build.gradle.kts index 134e3f807..288d9fa7b 100644 --- a/samples/containers/app-poetry/build.gradle.kts +++ b/samples/containers/app-poetry/build.gradle.kts @@ -14,10 +14,10 @@ android { dependencies { debugImplementation(libs.squareup.leakcanary.android) + implementation(libs.androidx.activity.ktx) + implementation(libs.androidx.recyclerview) + 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) } diff --git a/samples/containers/app-raven/build.gradle.kts b/samples/containers/app-raven/build.gradle.kts index 95cdb41f1..c2dd6b710 100644 --- a/samples/containers/app-raven/build.gradle.kts +++ b/samples/containers/app-raven/build.gradle.kts @@ -15,6 +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")) diff --git a/samples/containers/common/build.gradle.kts b/samples/containers/common/build.gradle.kts index 66f122ee9..ac5cf8cc3 100644 --- a/samples/containers/common/build.gradle.kts +++ b/samples/containers/common/build.gradle.kts @@ -3,14 +3,15 @@ plugins { } dependencies { - implementation(project(":workflow-ui:container-common")) - implementation(project(":workflow-core")) - implementation(libs.kotlin.jdk6) - testImplementation(libs.kotlin.test.jdk) + implementation(project(":workflow-core")) + implementation(project(":workflow-ui:container-common")) + testImplementation(libs.hamcrest) testImplementation(libs.junit) + testImplementation(libs.kotlin.test.jdk) testImplementation(libs.truth) + testImplementation(project(":workflow-testing")) } diff --git a/samples/containers/hello-back-button/build.gradle.kts b/samples/containers/hello-back-button/build.gradle.kts index 983c6d88d..0e45386bf 100644 --- a/samples/containers/hello-back-button/build.gradle.kts +++ b/samples/containers/hello-back-button/build.gradle.kts @@ -15,7 +15,8 @@ android { dependencies { debugImplementation(libs.squareup.leakcanary.android) + implementation(libs.androidx.activity.ktx) + implementation(project(":samples:containers:android")) implementation(project(":workflow-ui:core-android")) - implementation(libs.androidx.activity.ktx) } diff --git a/samples/containers/poetry/build.gradle.kts b/samples/containers/poetry/build.gradle.kts index 17252468a..e282e65ef 100644 --- a/samples/containers/poetry/build.gradle.kts +++ b/samples/containers/poetry/build.gradle.kts @@ -5,15 +5,13 @@ 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:container-android")) + implementation(libs.androidx.appcompat) implementation(libs.androidx.recyclerview) implementation(libs.androidx.savedstate) @@ -21,7 +19,10 @@ dependencies { implementation(libs.kotlinx.coroutines.core) implementation(libs.timber) + implementation(project(":samples:containers:android")) + implementation(project(":workflow-runtime")) + testImplementation(libs.junit) - testImplementation(libs.truth) testImplementation(libs.kotlinx.coroutines.test) + testImplementation(libs.truth) } diff --git a/samples/dungeon/app/build.gradle.kts b/samples/dungeon/app/build.gradle.kts index 4346f5c3d..2448ce0ce 100644 --- a/samples/dungeon/app/build.gradle.kts +++ b/samples/dungeon/app/build.gradle.kts @@ -22,27 +22,27 @@ 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.constraintlayout) + implementation(libs.androidx.gridlayout) // Used to side load Baseline Profile when Benchmarking. implementation(libs.androidx.profileinstaller) implementation(libs.google.android.material) - implementation(libs.androidx.gridlayout) 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-shakeable")) + implementation(project(":workflow-tracing")) + implementation(project(":workflow-ui:container-android")) testImplementation(libs.junit) testImplementation(libs.truth) - - androidTestImplementation(libs.squareup.leakcanary.instrumentation) - androidTestImplementation(libs.androidx.test.uiautomator) } diff --git a/samples/dungeon/common/build.gradle.kts b/samples/dungeon/common/build.gradle.kts index 60882bfa8..5c4ac6c88 100644 --- a/samples/dungeon/common/build.gradle.kts +++ b/samples/dungeon/common/build.gradle.kts @@ -4,13 +4,14 @@ plugins { } dependencies { - implementation(project(":workflow-ui:core-common")) - implementation(project(":workflow-core")) - - implementation(libs.kotlinx.serialization.json) implementation(libs.kotlin.jdk8) + implementation(libs.kotlinx.serialization.json) + + implementation(project(":workflow-core")) + implementation(project(":workflow-ui:core-common")) - testImplementation(project(":workflow-testing")) testImplementation(libs.kotlin.test.jdk) testImplementation(libs.truth) + + testImplementation(project(":workflow-testing")) } diff --git a/samples/dungeon/timemachine-shakeable/build.gradle.kts b/samples/dungeon/timemachine-shakeable/build.gradle.kts index 56e6b27d9..835fa6879 100644 --- a/samples/dungeon/timemachine-shakeable/build.gradle.kts +++ b/samples/dungeon/timemachine-shakeable/build.gradle.kts @@ -7,9 +7,10 @@ plugins { dependencies { api(project(":samples:dungeon:timemachine")) - implementation(project(":workflow-ui:core-android")) implementation(libs.androidx.constraintlayout) implementation(libs.google.android.material) implementation(libs.kotlin.jdk8) implementation(libs.squareup.seismic) + + implementation(project(":workflow-ui:core-android")) } diff --git a/samples/dungeon/timemachine/build.gradle.kts b/samples/dungeon/timemachine/build.gradle.kts index 5be0a9a8d..47de3d232 100644 --- a/samples/dungeon/timemachine/build.gradle.kts +++ b/samples/dungeon/timemachine/build.gradle.kts @@ -3,13 +3,14 @@ plugins { } dependencies { - implementation(project(":workflow-core")) - implementation(libs.kotlin.jdk8) - testImplementation(libs.kotlin.test.jdk) + implementation(project(":workflow-core")) + testImplementation(libs.hamcrest) testImplementation(libs.junit) + testImplementation(libs.kotlin.test.jdk) testImplementation(libs.truth) + testImplementation(project(":workflow-testing")) } diff --git a/samples/hello-terminal/terminal-workflow/build.gradle.kts b/samples/hello-terminal/terminal-workflow/build.gradle.kts index 10fbc3c08..e8653906b 100644 --- a/samples/hello-terminal/terminal-workflow/build.gradle.kts +++ b/samples/hello-terminal/terminal-workflow/build.gradle.kts @@ -3,8 +3,8 @@ plugins { } dependencies { + implementation(libs.lanterna) + implementation(project(":workflow-core")) implementation(project(":workflow-runtime")) - - implementation(libs.lanterna) } diff --git a/samples/hello-workflow-fragment/build.gradle.kts b/samples/hello-workflow-fragment/build.gradle.kts index f3d14b1ec..0d176b4ea 100644 --- a/samples/hello-workflow-fragment/build.gradle.kts +++ b/samples/hello-workflow-fragment/build.gradle.kts @@ -14,9 +14,9 @@ android { dependencies { debugImplementation(libs.squareup.leakcanary.android) - implementation(project(":workflow-ui:core-android")) - implementation(libs.androidx.fragment.ktx) implementation(libs.androidx.lifecycle.viewmodel.ktx) implementation(libs.androidx.lifecycle.viewmodel.savedstate) + + implementation(project(":workflow-ui:core-android")) } diff --git a/samples/hello-workflow/build.gradle.kts b/samples/hello-workflow/build.gradle.kts index d357f8d68..445d67086 100644 --- a/samples/hello-workflow/build.gradle.kts +++ b/samples/hello-workflow/build.gradle.kts @@ -14,10 +14,10 @@ android { dependencies { debugImplementation(libs.squareup.leakcanary.android) - implementation(project(":workflow-ui:core-android")) - implementation(libs.androidx.activity.ktx) implementation(libs.androidx.lifecycle.viewmodel.ktx) implementation(libs.androidx.lifecycle.viewmodel.savedstate) implementation(libs.androidx.viewbinding) + + implementation(project(":workflow-ui:core-android")) } diff --git a/samples/stub-visibility/build.gradle.kts b/samples/stub-visibility/build.gradle.kts index 813bd6e03..2877c1384 100644 --- a/samples/stub-visibility/build.gradle.kts +++ b/samples/stub-visibility/build.gradle.kts @@ -14,10 +14,10 @@ android { dependencies { debugImplementation(libs.squareup.leakcanary.android) - implementation(project(":workflow-ui:core-android")) - implementation(libs.androidx.activity.ktx) implementation(libs.androidx.lifecycle.viewmodel.core) implementation(libs.androidx.lifecycle.viewmodel.ktx) implementation(libs.androidx.viewbinding) + + implementation(project(":workflow-ui:core-android")) } diff --git a/samples/tictactoe/app/build.gradle.kts b/samples/tictactoe/app/build.gradle.kts index 3ce2ef23d..fb96d3925 100644 --- a/samples/tictactoe/app/build.gradle.kts +++ b/samples/tictactoe/app/build.gradle.kts @@ -15,25 +15,25 @@ android { } dependencies { - debugImplementation(libs.squareup.leakcanary.android) + androidTestImplementation(libs.androidx.test.core) + androidTestImplementation(libs.androidx.test.espresso.intents) + androidTestImplementation(libs.androidx.test.junit) + androidTestImplementation(libs.androidx.test.runner) + androidTestImplementation(libs.androidx.test.truth) + androidTestImplementation(libs.truth) - implementation(project(":samples:containers:android")) - implementation(project(":samples:tictactoe:common")) - implementation(project(":workflow-ui:core-android")) - implementation(project(":workflow-tracing")) + debugImplementation(libs.squareup.leakcanary.android) implementation(libs.androidx.activity.ktx) implementation(libs.androidx.constraintlayout) implementation(libs.androidx.lifecycle.ktx) - implementation(libs.squareup.okio) - implementation(libs.rxjava2.rxandroid) implementation(libs.androidx.test.espresso.idlingResource) + implementation(libs.rxjava2.rxandroid) + implementation(libs.squareup.okio) implementation(libs.timber) - androidTestImplementation(libs.androidx.test.espresso.intents) - androidTestImplementation(libs.androidx.test.core) - androidTestImplementation(libs.androidx.test.junit) - androidTestImplementation(libs.androidx.test.runner) - androidTestImplementation(libs.androidx.test.truth) - androidTestImplementation(libs.truth) + implementation(project(":samples:containers:android")) + implementation(project(":samples:tictactoe:common")) + implementation(project(":workflow-tracing")) + implementation(project(":workflow-ui:core-android")) } diff --git a/samples/tictactoe/common/build.gradle.kts b/samples/tictactoe/common/build.gradle.kts index ec3cd9f12..216103af2 100644 --- a/samples/tictactoe/common/build.gradle.kts +++ b/samples/tictactoe/common/build.gradle.kts @@ -3,15 +3,16 @@ plugins { } dependencies { + implementation(libs.kotlin.jdk6) + implementation(project(":samples:containers:common")) - implementation(project(":workflow-ui:container-common")) implementation(project(":workflow-core")) implementation(project(":workflow-rx2")) - - implementation(libs.kotlin.jdk6) + implementation(project(":workflow-ui:container-common")) testImplementation(libs.hamcrest) testImplementation(libs.junit) testImplementation(libs.truth) + testImplementation(project(":workflow-testing")) } diff --git a/samples/todo-android/app/build.gradle.kts b/samples/todo-android/app/build.gradle.kts index 77e47369e..9a3820027 100644 --- a/samples/todo-android/app/build.gradle.kts +++ b/samples/todo-android/app/build.gradle.kts @@ -13,26 +13,26 @@ android { } dependencies { - debugImplementation(libs.squareup.leakcanary.android) + androidTestImplementation(libs.androidx.test.uiautomator) - implementation(project(":samples:containers:android")) - implementation(project(":samples:containers:common")) - implementation(project(":workflow-core")) - implementation(project(":workflow-rx2")) - implementation(project(":workflow-ui:core-android")) - implementation(project(":workflow-ui:container-common")) - implementation(project(":workflow-tracing")) + debugImplementation(libs.squareup.leakcanary.android) implementation(libs.androidx.activity.ktx) implementation(libs.androidx.constraintlayout) implementation(libs.google.android.material) implementation(libs.kotlinx.coroutines.rx2) - implementation(libs.squareup.okio) implementation(libs.rxjava2.rxandroid) + implementation(libs.squareup.okio) implementation(libs.timber) + implementation(project(":samples:containers:android")) + implementation(project(":samples:containers:common")) + implementation(project(":workflow-core")) + implementation(project(":workflow-rx2")) + implementation(project(":workflow-tracing")) + implementation(project(":workflow-ui:container-common")) + implementation(project(":workflow-ui:core-android")) + testImplementation(libs.junit) testImplementation(libs.truth) - - androidTestImplementation(libs.androidx.test.uiautomator) } diff --git a/trace-encoder/build.gradle.kts b/trace-encoder/build.gradle.kts index 95fdb86d6..f3385f765 100644 --- a/trace-encoder/build.gradle.kts +++ b/trace-encoder/build.gradle.kts @@ -5,16 +5,16 @@ plugins { } dependencies { - compileOnly(libs.jetbrains.annotations) - compileOnly(libs.squareup.moshi.codegen) - - ksp(libs.squareup.moshi.codegen) - api(libs.kotlin.jdk8) api(libs.kotlinx.coroutines.core) - implementation(libs.squareup.moshi.adapters) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.squareup.moshi.codegen) + implementation(libs.squareup.moshi) + implementation(libs.squareup.moshi.adapters) + + ksp(libs.squareup.moshi.codegen) testImplementation(libs.kotlin.test.jdk) } diff --git a/workflow-core/build.gradle.kts b/workflow-core/build.gradle.kts index ed9b091fe..5e6ed193c 100644 --- a/workflow-core/build.gradle.kts +++ b/workflow-core/build.gradle.kts @@ -23,9 +23,9 @@ kotlin { } val commonTest by getting { dependencies { + implementation(libs.kotlin.test.jdk) implementation(libs.kotlinx.atomicfu) implementation(libs.kotlinx.coroutines.test.common) - implementation(libs.kotlin.test.jdk) } } } diff --git a/workflow-runtime/build.gradle.kts b/workflow-runtime/build.gradle.kts index 57f66e1cc..7b5b06a8a 100644 --- a/workflow-runtime/build.gradle.kts +++ b/workflow-runtime/build.gradle.kts @@ -18,8 +18,9 @@ kotlin { } defaultSourceSet { dependencies { - implementation(main.compileDependencyFiles + main.output.classesDirs) implementation(libs.kotlinx.benchmark.runtime) + + implementation(main.compileDependencyFiles + main.output.classesDirs) } } } @@ -35,14 +36,15 @@ kotlin { } val commonMain by getting { dependencies { - api(project(":workflow-core")) api(libs.kotlinx.coroutines.core) + + api(project(":workflow-core")) } } val commonTest by getting { dependencies { - implementation(libs.kotlinx.coroutines.test.common) implementation(libs.kotlin.test.jdk) + implementation(libs.kotlinx.coroutines.test.common) } } } diff --git a/workflow-rx2/build.gradle.kts b/workflow-rx2/build.gradle.kts index 17f5b5734..75945853a 100644 --- a/workflow-rx2/build.gradle.kts +++ b/workflow-rx2/build.gradle.kts @@ -4,15 +4,17 @@ plugins { } dependencies { - compileOnly(libs.jetbrains.annotations) - - api(project(":workflow-core")) api(libs.kotlin.jdk6) api(libs.kotlinx.coroutines.core) api(libs.rxjava2.rxjava) + api(project(":workflow-core")) + + compileOnly(libs.jetbrains.annotations) + implementation(libs.kotlinx.coroutines.rx2) - testImplementation(project(":workflow-testing")) testImplementation(libs.kotlin.test.jdk) + + testImplementation(project(":workflow-testing")) } diff --git a/workflow-testing/build.gradle.kts b/workflow-testing/build.gradle.kts index 3695eda76..18ff737e6 100644 --- a/workflow-testing/build.gradle.kts +++ b/workflow-testing/build.gradle.kts @@ -21,16 +21,18 @@ tasks.withType { } dependencies { - compileOnly(libs.jetbrains.annotations) + api(libs.kotlin.jdk7) api(project(":workflow-core")) api(project(":workflow-runtime")) - api(libs.kotlin.jdk7) + + compileOnly(libs.jetbrains.annotations) + + implementation(libs.kotlin.reflect) + implementation(libs.kotlinx.coroutines.test) implementation(project(":internal-testing-utils")) implementation(project(":workflow-config:config-jvm")) - implementation(libs.kotlinx.coroutines.test) - implementation(libs.kotlin.reflect) testImplementation(libs.kotlin.test.jdk) testImplementation(libs.mockito.kotlin) diff --git a/workflow-tracing/build.gradle.kts b/workflow-tracing/build.gradle.kts index d56e21a10..51e88970b 100644 --- a/workflow-tracing/build.gradle.kts +++ b/workflow-tracing/build.gradle.kts @@ -4,16 +4,17 @@ plugins { } dependencies { - compileOnly(libs.jetbrains.annotations) + api(libs.kotlin.jdk8) + api(libs.kotlinx.coroutines.core) api(project(":trace-encoder")) api(project(":workflow-runtime")) - api(libs.kotlin.jdk8) - api(libs.kotlinx.coroutines.core) - implementation(libs.squareup.okio) - implementation(libs.squareup.moshi.adapters) + compileOnly(libs.jetbrains.annotations) + implementation(libs.squareup.moshi) + implementation(libs.squareup.moshi.adapters) + implementation(libs.squareup.okio) testImplementation(libs.kotlin.test.jdk) testImplementation(libs.mockito.kotlin) diff --git a/workflow-ui/compose-tooling/build.gradle.kts b/workflow-ui/compose-tooling/build.gradle.kts index f7ffc1e37..b9b1de012 100644 --- a/workflow-ui/compose-tooling/build.gradle.kts +++ b/workflow-ui/compose-tooling/build.gradle.kts @@ -25,15 +25,16 @@ tasks.withType { } dependencies { - api(project(":workflow-ui:compose")) - - implementation(libs.androidx.compose.ui.tooling) - - androidTestImplementation(project(":workflow-runtime")) androidTestImplementation(libs.androidx.activity.core) androidTestImplementation(libs.androidx.compose.ui) - androidTestImplementation(libs.kotlin.test.jdk) + androidTestImplementation(libs.androidx.compose.ui.test.junit4) androidTestImplementation(libs.androidx.test.core) androidTestImplementation(libs.androidx.test.truth) - androidTestImplementation(libs.androidx.compose.ui.test.junit4) + androidTestImplementation(libs.kotlin.test.jdk) + + androidTestImplementation(project(":workflow-runtime")) + + api(project(":workflow-ui:compose")) + + implementation(libs.androidx.compose.ui.tooling) } diff --git a/workflow-ui/compose/build.gradle.kts b/workflow-ui/compose/build.gradle.kts index ee921395c..5702530e8 100644 --- a/workflow-ui/compose/build.gradle.kts +++ b/workflow-ui/compose/build.gradle.kts @@ -25,19 +25,21 @@ tasks.withType { } dependencies { - api(project(":workflow-core")) - api(project(":workflow-ui:core-android")) - api(project(":workflow-ui:container-android")) - api(libs.androidx.compose.foundation) - - implementation(libs.androidx.savedstate) - - androidTestImplementation(project(":workflow-runtime")) - androidTestImplementation(project(":workflow-ui:internal-testing-compose")) androidTestImplementation(libs.androidx.activity.core) androidTestImplementation(libs.androidx.compose.ui) - androidTestImplementation(libs.kotlin.test.jdk) + androidTestImplementation(libs.androidx.compose.ui.test.junit4) androidTestImplementation(libs.androidx.test.core) androidTestImplementation(libs.androidx.test.truth) - androidTestImplementation(libs.androidx.compose.ui.test.junit4) + androidTestImplementation(libs.kotlin.test.jdk) + + androidTestImplementation(project(":workflow-runtime")) + androidTestImplementation(project(":workflow-ui:internal-testing-compose")) + + api(libs.androidx.compose.foundation) + + api(project(":workflow-core")) + api(project(":workflow-ui:container-android")) + api(project(":workflow-ui:core-android")) + + implementation(libs.androidx.savedstate) } diff --git a/workflow-ui/container-android/build.gradle.kts b/workflow-ui/container-android/build.gradle.kts index b9454149b..38d404a21 100644 --- a/workflow-ui/container-android/build.gradle.kts +++ b/workflow-ui/container-android/build.gradle.kts @@ -7,28 +7,29 @@ plugins { } dependencies { - api(project(":workflow-core")) - api(project(":workflow-ui:core-android")) - api(project(":workflow-ui:container-common")) + androidTestImplementation(libs.truth) api(libs.androidx.transition) api(libs.kotlin.jdk6) - implementation(project(":workflow-runtime")) - implementation(libs.androidx.appcompat) + api(project(":workflow-core")) + api(project(":workflow-ui:container-common")) + api(project(":workflow-ui:core-android")) + implementation(libs.androidx.activity.core) + implementation(libs.androidx.appcompat) implementation(libs.androidx.fragment.core) implementation(libs.androidx.savedstate) implementation(libs.kotlinx.coroutines.android) implementation(libs.kotlinx.coroutines.core) - testImplementation(libs.kotlinx.coroutines.test) + implementation(project(":workflow-runtime")) + + testImplementation(libs.androidx.test.core) + testImplementation(libs.junit) testImplementation(libs.kotlin.test.jdk) + testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.mockito.kotlin) - testImplementation(libs.junit) - testImplementation(libs.truth) - testImplementation(libs.androidx.test.core) testImplementation(libs.robolectric) - - androidTestImplementation(libs.truth) + testImplementation(libs.truth) } diff --git a/workflow-ui/container-common/build.gradle.kts b/workflow-ui/container-common/build.gradle.kts index 2318dc47c..4a514c473 100644 --- a/workflow-ui/container-common/build.gradle.kts +++ b/workflow-ui/container-common/build.gradle.kts @@ -4,10 +4,11 @@ plugins { } dependencies { - api(project(":workflow-ui:core-common")) api(libs.kotlin.jdk6) api(libs.squareup.okio) + api(project(":workflow-ui:core-common")) + testImplementation(libs.kotlin.test.jdk) testImplementation(libs.truth) } diff --git a/workflow-ui/core-android/build.gradle.kts b/workflow-ui/core-android/build.gradle.kts index 5109281da..d42bd65de 100644 --- a/workflow-ui/core-android/build.gradle.kts +++ b/workflow-ui/core-android/build.gradle.kts @@ -7,15 +7,18 @@ plugins { } dependencies { - compileOnly(libs.androidx.viewbinding) + androidTestImplementation(libs.androidx.appcompat) + androidTestImplementation(libs.truth) + + api(libs.androidx.transition) + api(libs.kotlin.jdk6) api(project(":workflow-core")) // Needs to be API for the WorkflowInterceptor argument to WorkflowRunner.Config. api(project(":workflow-runtime")) api(project(":workflow-ui:core-common")) - api(libs.androidx.transition) - api(libs.kotlin.jdk6) + compileOnly(libs.androidx.viewbinding) implementation(libs.androidx.activity.core) implementation(libs.androidx.core) @@ -27,15 +30,12 @@ dependencies { implementation(libs.kotlinx.coroutines.android) implementation(libs.kotlinx.coroutines.core) - testImplementation(libs.kotlinx.coroutines.test) - testImplementation(libs.kotlin.test.jdk) - testImplementation(libs.mockito.kotlin) - testImplementation(libs.androidx.test.core) testImplementation(libs.androidx.lifecycle.testing) + testImplementation(libs.androidx.test.core) testImplementation(libs.junit) - testImplementation(libs.truth) + testImplementation(libs.kotlin.test.jdk) + testImplementation(libs.kotlinx.coroutines.test) + testImplementation(libs.mockito.kotlin) testImplementation(libs.robolectric) - - androidTestImplementation(libs.androidx.appcompat) - androidTestImplementation(libs.truth) + testImplementation(libs.truth) } diff --git a/workflow-ui/core-common/build.gradle.kts b/workflow-ui/core-common/build.gradle.kts index 62dd1f10b..a15562ccc 100644 --- a/workflow-ui/core-common/build.gradle.kts +++ b/workflow-ui/core-common/build.gradle.kts @@ -5,8 +5,8 @@ plugins { dependencies { api(libs.kotlin.jdk6) - api(libs.squareup.okio) api(libs.kotlinx.coroutines.core) + api(libs.squareup.okio) testImplementation(libs.kotlin.test.jdk) testImplementation(libs.truth) diff --git a/workflow-ui/internal-testing-android/build.gradle.kts b/workflow-ui/internal-testing-android/build.gradle.kts index 6ab46c2da..bb9ab2db3 100644 --- a/workflow-ui/internal-testing-android/build.gradle.kts +++ b/workflow-ui/internal-testing-android/build.gradle.kts @@ -8,8 +8,6 @@ plugins { // This module is not published, since it's just internal testing utilities. dependencies { - api(project(":workflow-ui:core-android")) - api(libs.androidx.appcompat) api(libs.androidx.test.core) api(libs.androidx.test.espresso.core) @@ -20,6 +18,8 @@ dependencies { api(libs.kotlinx.coroutines.test) api(libs.truth) + api(project(":workflow-ui:core-android")) + implementation(libs.squareup.leakcanary.instrumentation) testImplementation(libs.robolectric) diff --git a/workflow-ui/internal-testing-compose/build.gradle.kts b/workflow-ui/internal-testing-compose/build.gradle.kts index c5547e27e..4b119f8fc 100644 --- a/workflow-ui/internal-testing-compose/build.gradle.kts +++ b/workflow-ui/internal-testing-compose/build.gradle.kts @@ -8,7 +8,8 @@ plugins { // This module is not published, since it's just internal testing utilities. dependencies { + api(libs.androidx.compose.ui.test.junit4) + api(project(":workflow-ui:compose")) api(project(":workflow-ui:core-android")) - api(libs.androidx.compose.ui.test.junit4) } diff --git a/workflow-ui/radiography/build.gradle.kts b/workflow-ui/radiography/build.gradle.kts index f3077feb3..209dfa3a7 100644 --- a/workflow-ui/radiography/build.gradle.kts +++ b/workflow-ui/radiography/build.gradle.kts @@ -7,18 +7,21 @@ plugins { } dependencies { - api(project(":workflow-ui:core-android")) - api(libs.squareup.radiography) + androidTestImplementation(libs.androidx.test.core) + androidTestImplementation(libs.androidx.test.truth) + + androidTestImplementation(project(":workflow-ui:container-android")) + api(libs.kotlin.jdk6) + api(libs.squareup.radiography) + + api(project(":workflow-ui:core-android")) - implementation(project(":workflow-runtime")) implementation(libs.androidx.activity.core) implementation(libs.androidx.fragment.core) implementation(libs.androidx.savedstate) implementation(libs.kotlinx.coroutines.android) implementation(libs.kotlinx.coroutines.core) - androidTestImplementation(project(":workflow-ui:container-android")) - androidTestImplementation(libs.androidx.test.core) - androidTestImplementation(libs.androidx.test.truth) + implementation(project(":workflow-runtime")) } From 5d512176ff9a7f88bfd54cdca809ac742f82e5ae Mon Sep 17 00:00:00 2001 From: Rick Busarow Date: Fri, 29 Jul 2022 13:00:23 -0500 Subject: [PATCH 2/2] apply dependency-analysis-android-gradle-plugin recommendations - ignored recommentations to make things `implementation` where there's a comment specifically saying to leave it as `api` - ignored false positives saying to remove `:workflow-tracing` dependencies from sample projects --- .../complex-poetry/build.gradle.kts | 9 ++++++++ gradle/libs.versions.toml | 21 +++++++++++++++-- internal-testing-utils/build.gradle.kts | 1 + samples/compose-samples/build.gradle.kts | 9 ++++++++ samples/containers/android/build.gradle.kts | 7 +++--- .../containers/app-poetry/build.gradle.kts | 1 - samples/containers/app-raven/build.gradle.kts | 1 - samples/containers/common/build.gradle.kts | 7 ++---- .../hello-back-button/build.gradle.kts | 2 ++ samples/containers/poetry/build.gradle.kts | 4 ++-- samples/dungeon/app/build.gradle.kts | 9 ++++++++ samples/dungeon/common/build.gradle.kts | 13 +++++++---- .../timemachine-shakeable/build.gradle.kts | 9 ++++++-- samples/dungeon/timemachine/build.gradle.kts | 5 ++-- .../hello-terminal-app/build.gradle.kts | 3 ++- .../terminal-workflow/build.gradle.kts | 5 +++- .../todo-terminal-app/build.gradle.kts | 3 ++- .../hello-workflow-fragment/build.gradle.kts | 1 + samples/hello-workflow/build.gradle.kts | 1 + samples/stub-visibility/build.gradle.kts | 1 + samples/tictactoe/app/build.gradle.kts | 6 +++++ samples/tictactoe/common/build.gradle.kts | 9 ++++++-- samples/todo-android/app/build.gradle.kts | 3 +-- trace-encoder/build.gradle.kts | 3 +++ .../dependencies/runtimeClasspath.txt | 3 ++- .../config-android/build.gradle.kts | 4 +++- workflow-rx2/build.gradle.kts | 3 +++ workflow-tracing/build.gradle.kts | 4 ++++ workflow-ui/compose-tooling/build.gradle.kts | 11 ++++++--- .../dependencies/releaseRuntimeClasspath.txt | 23 ------------------- workflow-ui/compose/build.gradle.kts | 23 +++++++++++++------ .../dependencies/releaseRuntimeClasspath.txt | 18 --------------- .../container-android/build.gradle.kts | 13 ++++------- .../dependencies/releaseRuntimeClasspath.txt | 1 - workflow-ui/container-common/build.gradle.kts | 3 ++- workflow-ui/core-android/build.gradle.kts | 17 +++++++++----- .../dependencies/releaseRuntimeClasspath.txt | 6 ----- .../squareup/workflow1/ui/WorkflowLayout.kt | 1 - workflow-ui/core-common/build.gradle.kts | 2 ++ .../internal-testing-android/build.gradle.kts | 9 ++++++++ workflow-ui/radiography/build.gradle.kts | 14 +++-------- .../dependencies/releaseRuntimeClasspath.txt | 6 ----- 42 files changed, 169 insertions(+), 125 deletions(-) diff --git a/benchmarks/performance-poetry/complex-poetry/build.gradle.kts b/benchmarks/performance-poetry/complex-poetry/build.gradle.kts index 04430740b..74dd2f48d 100644 --- a/benchmarks/performance-poetry/complex-poetry/build.gradle.kts +++ b/benchmarks/performance-poetry/complex-poetry/build.gradle.kts @@ -53,17 +53,26 @@ dependencies { // 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) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c5919d1da..9c9aca941 100644 --- a/gradle/libs.versions.toml +++ b/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" } diff --git a/internal-testing-utils/build.gradle.kts b/internal-testing-utils/build.gradle.kts index ffe0e0a09..fdc2a9f77 100644 --- a/internal-testing-utils/build.gradle.kts +++ b/internal-testing-utils/build.gradle.kts @@ -7,6 +7,7 @@ dependencies { implementation(libs.kotlin.jdk8) testImplementation(libs.junit) + testImplementation(libs.kotlin.test.core) testImplementation(libs.kotlin.test.jdk) testImplementation(libs.truth) } diff --git a/samples/compose-samples/build.gradle.kts b/samples/compose-samples/build.gradle.kts index 147e78676..c8efd7715 100644 --- a/samples/compose-samples/build.gradle.kts +++ b/samples/compose-samples/build.gradle.kts @@ -31,16 +31,25 @@ dependencies { debugImplementation(libs.squareup.leakcanary.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.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) implementation(project(":workflow-ui:compose")) implementation(project(":workflow-ui:compose-tooling")) implementation(project(":workflow-ui:core-android")) + implementation(project(":workflow-ui:core-common")) } diff --git a/samples/containers/android/build.gradle.kts b/samples/containers/android/build.gradle.kts index d2f22d617..78d1f269d 100644 --- a/samples/containers/android/build.gradle.kts +++ b/samples/containers/android/build.gradle.kts @@ -22,13 +22,12 @@ dependencies { api(libs.kotlin.jdk6) api(project(":samples:containers:common")) - api(project(":workflow-core")) - api(project(":workflow-ui:container-android")) + 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) - - implementation(project(":workflow-runtime")) } diff --git a/samples/containers/app-poetry/build.gradle.kts b/samples/containers/app-poetry/build.gradle.kts index 288d9fa7b..9e59dfdd6 100644 --- a/samples/containers/app-poetry/build.gradle.kts +++ b/samples/containers/app-poetry/build.gradle.kts @@ -19,5 +19,4 @@ dependencies { implementation(project(":samples:containers:android")) implementation(project(":samples:containers:poetry")) - implementation(project(":workflow-ui:core-android")) } diff --git a/samples/containers/app-raven/build.gradle.kts b/samples/containers/app-raven/build.gradle.kts index c2dd6b710..0a4a72826 100644 --- a/samples/containers/app-raven/build.gradle.kts +++ b/samples/containers/app-raven/build.gradle.kts @@ -18,5 +18,4 @@ dependencies { implementation(project(":samples:containers:android")) implementation(project(":samples:containers:poetry")) - implementation(project(":workflow-ui:core-android")) } diff --git a/samples/containers/common/build.gradle.kts b/samples/containers/common/build.gradle.kts index ac5cf8cc3..bcfc57993 100644 --- a/samples/containers/common/build.gradle.kts +++ b/samples/containers/common/build.gradle.kts @@ -3,15 +3,12 @@ plugins { } dependencies { - implementation(libs.kotlin.jdk6) + api(project(":workflow-ui:core-common")) - implementation(project(":workflow-core")) - implementation(project(":workflow-ui:container-common")) + implementation(libs.kotlin.jdk6) testImplementation(libs.hamcrest) testImplementation(libs.junit) testImplementation(libs.kotlin.test.jdk) testImplementation(libs.truth) - - testImplementation(project(":workflow-testing")) } diff --git a/samples/containers/hello-back-button/build.gradle.kts b/samples/containers/hello-back-button/build.gradle.kts index 0e45386bf..bdb29e95c 100644 --- a/samples/containers/hello-back-button/build.gradle.kts +++ b/samples/containers/hello-back-button/build.gradle.kts @@ -18,5 +18,7 @@ dependencies { implementation(libs.androidx.activity.ktx) implementation(project(":samples:containers:android")) + implementation(project(":workflow-ui:container-android")) implementation(project(":workflow-ui:core-android")) + implementation(project(":workflow-ui:core-common")) } diff --git a/samples/containers/poetry/build.gradle.kts b/samples/containers/poetry/build.gradle.kts index e282e65ef..7d8aa547c 100644 --- a/samples/containers/poetry/build.gradle.kts +++ b/samples/containers/poetry/build.gradle.kts @@ -10,7 +10,8 @@ dependencies { api(project(":samples:containers:common")) api(project(":workflow-core")) - api(project(":workflow-ui:container-android")) + api(project(":workflow-ui:core-android")) + api(project(":workflow-ui:core-common")) implementation(libs.androidx.appcompat) implementation(libs.androidx.recyclerview) @@ -20,7 +21,6 @@ dependencies { implementation(libs.timber) implementation(project(":samples:containers:android")) - implementation(project(":workflow-runtime")) testImplementation(libs.junit) testImplementation(libs.kotlinx.coroutines.test) diff --git a/samples/dungeon/app/build.gradle.kts b/samples/dungeon/app/build.gradle.kts index 2448ce0ce..5a48a816b 100644 --- a/samples/dungeon/app/build.gradle.kts +++ b/samples/dungeon/app/build.gradle.kts @@ -28,20 +28,29 @@ dependencies { 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.kotlin.common) + implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.coroutines.rx2) 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) diff --git a/samples/dungeon/common/build.gradle.kts b/samples/dungeon/common/build.gradle.kts index 5c4ac6c88..c94c10b1f 100644 --- a/samples/dungeon/common/build.gradle.kts +++ b/samples/dungeon/common/build.gradle.kts @@ -4,14 +4,17 @@ plugins { } dependencies { + api(libs.squareup.okio) + + api(project(":workflow-core")) + api(project(":workflow-ui:core-common")) + implementation(libs.kotlin.jdk8) + implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.serialization.json) - implementation(project(":workflow-core")) - implementation(project(":workflow-ui:core-common")) - + testImplementation(libs.junit) + testImplementation(libs.kotlin.test.core) testImplementation(libs.kotlin.test.jdk) testImplementation(libs.truth) - - testImplementation(project(":workflow-testing")) } diff --git a/samples/dungeon/timemachine-shakeable/build.gradle.kts b/samples/dungeon/timemachine-shakeable/build.gradle.kts index 835fa6879..bf4529f68 100644 --- a/samples/dungeon/timemachine-shakeable/build.gradle.kts +++ b/samples/dungeon/timemachine-shakeable/build.gradle.kts @@ -5,12 +5,17 @@ plugins { } dependencies { + api(libs.kotlinx.coroutines.core) + api(project(":samples:dungeon:timemachine")) + api(project(":workflow-core")) + api(project(":workflow-ui:core-android")) + api(project(":workflow-ui:core-common")) + implementation(libs.androidx.appcompat) implementation(libs.androidx.constraintlayout) + implementation(libs.androidx.transition) implementation(libs.google.android.material) implementation(libs.kotlin.jdk8) implementation(libs.squareup.seismic) - - implementation(project(":workflow-ui:core-android")) } diff --git a/samples/dungeon/timemachine/build.gradle.kts b/samples/dungeon/timemachine/build.gradle.kts index 47de3d232..4f3eab166 100644 --- a/samples/dungeon/timemachine/build.gradle.kts +++ b/samples/dungeon/timemachine/build.gradle.kts @@ -3,12 +3,13 @@ plugins { } dependencies { - implementation(libs.kotlin.jdk8) + api(project(":workflow-core")) - implementation(project(":workflow-core")) + implementation(libs.kotlin.jdk8) testImplementation(libs.hamcrest) testImplementation(libs.junit) + testImplementation(libs.kotlin.test.core) testImplementation(libs.kotlin.test.jdk) testImplementation(libs.truth) diff --git a/samples/hello-terminal/hello-terminal-app/build.gradle.kts b/samples/hello-terminal/hello-terminal-app/build.gradle.kts index cd45f2dea..0a8306942 100644 --- a/samples/hello-terminal/hello-terminal-app/build.gradle.kts +++ b/samples/hello-terminal/hello-terminal-app/build.gradle.kts @@ -6,7 +6,8 @@ plugins { application.mainClassName = "com.squareup.sample.helloterminal.MainKt" dependencies { + implementation(libs.kotlinx.coroutines.core) + implementation(project(":samples:hello-terminal:terminal-workflow")) implementation(project(":workflow-core")) - implementation(project(":workflow-runtime")) } diff --git a/samples/hello-terminal/terminal-workflow/build.gradle.kts b/samples/hello-terminal/terminal-workflow/build.gradle.kts index e8653906b..97de82b3c 100644 --- a/samples/hello-terminal/terminal-workflow/build.gradle.kts +++ b/samples/hello-terminal/terminal-workflow/build.gradle.kts @@ -3,8 +3,11 @@ plugins { } dependencies { + api(libs.kotlinx.coroutines.core) + + api(project(":workflow-core")) + implementation(libs.lanterna) - implementation(project(":workflow-core")) implementation(project(":workflow-runtime")) } diff --git a/samples/hello-terminal/todo-terminal-app/build.gradle.kts b/samples/hello-terminal/todo-terminal-app/build.gradle.kts index acf4322c6..c4e3f621a 100644 --- a/samples/hello-terminal/todo-terminal-app/build.gradle.kts +++ b/samples/hello-terminal/todo-terminal-app/build.gradle.kts @@ -6,7 +6,8 @@ plugins { application.mainClassName = "com.squareup.sample.hellotodo.MainKt" dependencies { + implementation(libs.kotlinx.coroutines.core) + implementation(project(":samples:hello-terminal:terminal-workflow")) implementation(project(":workflow-core")) - implementation(project(":workflow-runtime")) } diff --git a/samples/hello-workflow-fragment/build.gradle.kts b/samples/hello-workflow-fragment/build.gradle.kts index 0d176b4ea..684d979b9 100644 --- a/samples/hello-workflow-fragment/build.gradle.kts +++ b/samples/hello-workflow-fragment/build.gradle.kts @@ -19,4 +19,5 @@ dependencies { implementation(libs.androidx.lifecycle.viewmodel.savedstate) implementation(project(":workflow-ui:core-android")) + implementation(project(":workflow-ui:core-common")) } diff --git a/samples/hello-workflow/build.gradle.kts b/samples/hello-workflow/build.gradle.kts index 445d67086..4a7cd5d55 100644 --- a/samples/hello-workflow/build.gradle.kts +++ b/samples/hello-workflow/build.gradle.kts @@ -20,4 +20,5 @@ dependencies { implementation(libs.androidx.viewbinding) implementation(project(":workflow-ui:core-android")) + implementation(project(":workflow-ui:core-common")) } diff --git a/samples/stub-visibility/build.gradle.kts b/samples/stub-visibility/build.gradle.kts index 2877c1384..d1256f047 100644 --- a/samples/stub-visibility/build.gradle.kts +++ b/samples/stub-visibility/build.gradle.kts @@ -20,4 +20,5 @@ dependencies { implementation(libs.androidx.viewbinding) implementation(project(":workflow-ui:core-android")) + implementation(project(":workflow-ui:core-common")) } diff --git a/samples/tictactoe/app/build.gradle.kts b/samples/tictactoe/app/build.gradle.kts index fb96d3925..a8f13dc5e 100644 --- a/samples/tictactoe/app/build.gradle.kts +++ b/samples/tictactoe/app/build.gradle.kts @@ -27,13 +27,19 @@ dependencies { implementation(libs.androidx.activity.ktx) implementation(libs.androidx.constraintlayout) implementation(libs.androidx.lifecycle.ktx) + implementation(libs.androidx.lifecycle.viewmodel.core) implementation(libs.androidx.test.espresso.idlingResource) + implementation(libs.androidx.transition) + implementation(libs.kotlinx.coroutines.core) implementation(libs.rxjava2.rxandroid) + implementation(libs.rxjava2.rxjava) implementation(libs.squareup.okio) implementation(libs.timber) implementation(project(":samples:containers:android")) implementation(project(":samples:tictactoe:common")) implementation(project(":workflow-tracing")) + implementation(project(":workflow-ui:container-android")) implementation(project(":workflow-ui:core-android")) + implementation(project(":workflow-ui:core-common")) } diff --git a/samples/tictactoe/common/build.gradle.kts b/samples/tictactoe/common/build.gradle.kts index 216103af2..38a5acd24 100644 --- a/samples/tictactoe/common/build.gradle.kts +++ b/samples/tictactoe/common/build.gradle.kts @@ -3,12 +3,17 @@ plugins { } dependencies { + api(libs.rxjava2.rxjava) + api(libs.squareup.okio) + + api(project(":workflow-core")) + api(project(":workflow-ui:core-common")) + implementation(libs.kotlin.jdk6) + implementation(libs.kotlinx.coroutines.core) implementation(project(":samples:containers:common")) - implementation(project(":workflow-core")) implementation(project(":workflow-rx2")) - implementation(project(":workflow-ui:container-common")) testImplementation(libs.hamcrest) testImplementation(libs.junit) diff --git a/samples/todo-android/app/build.gradle.kts b/samples/todo-android/app/build.gradle.kts index 9a3820027..d2c18a32d 100644 --- a/samples/todo-android/app/build.gradle.kts +++ b/samples/todo-android/app/build.gradle.kts @@ -28,10 +28,9 @@ dependencies { implementation(project(":samples:containers:android")) implementation(project(":samples:containers:common")) implementation(project(":workflow-core")) - implementation(project(":workflow-rx2")) implementation(project(":workflow-tracing")) - implementation(project(":workflow-ui:container-common")) implementation(project(":workflow-ui:core-android")) + implementation(project(":workflow-ui:core-common")) testImplementation(libs.junit) testImplementation(libs.truth) diff --git a/trace-encoder/build.gradle.kts b/trace-encoder/build.gradle.kts index f3385f765..0738a5c79 100644 --- a/trace-encoder/build.gradle.kts +++ b/trace-encoder/build.gradle.kts @@ -7,6 +7,7 @@ plugins { dependencies { api(libs.kotlin.jdk8) api(libs.kotlinx.coroutines.core) + api(libs.squareup.okio) compileOnly(libs.jetbrains.annotations) compileOnly(libs.squareup.moshi.codegen) @@ -16,5 +17,7 @@ dependencies { ksp(libs.squareup.moshi.codegen) + testImplementation(libs.junit) + testImplementation(libs.kotlin.test.core) testImplementation(libs.kotlin.test.jdk) } diff --git a/trace-encoder/dependencies/runtimeClasspath.txt b/trace-encoder/dependencies/runtimeClasspath.txt index 9fdc0b3a3..f16fd89e8 100644 --- a/trace-encoder/dependencies/runtimeClasspath.txt +++ b/trace-encoder/dependencies/runtimeClasspath.txt @@ -1,6 +1,7 @@ com.squareup.moshi:moshi-adapters:1.13.0 com.squareup.moshi:moshi:1.13.0 -com.squareup.okio:okio:2.10.0 +com.squareup.okio:okio-jvm:3.0.0 +com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.6.10 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 diff --git a/workflow-config/config-android/build.gradle.kts b/workflow-config/config-android/build.gradle.kts index e1f3cc7dd..a9909e55a 100644 --- a/workflow-config/config-android/build.gradle.kts +++ b/workflow-config/config-android/build.gradle.kts @@ -17,5 +17,7 @@ android { } dependencies { - api(project(":workflow-runtime")) + api(libs.kotlin.common) + + implementation(project(":workflow-runtime")) } diff --git a/workflow-rx2/build.gradle.kts b/workflow-rx2/build.gradle.kts index 75945853a..a77374d40 100644 --- a/workflow-rx2/build.gradle.kts +++ b/workflow-rx2/build.gradle.kts @@ -6,6 +6,7 @@ plugins { dependencies { api(libs.kotlin.jdk6) api(libs.kotlinx.coroutines.core) + api(libs.reactivestreams) api(libs.rxjava2.rxjava) api(project(":workflow-core")) @@ -14,6 +15,8 @@ dependencies { implementation(libs.kotlinx.coroutines.rx2) + testImplementation(libs.junit) + testImplementation(libs.kotlin.test.core) testImplementation(libs.kotlin.test.jdk) testImplementation(project(":workflow-testing")) diff --git a/workflow-tracing/build.gradle.kts b/workflow-tracing/build.gradle.kts index 51e88970b..5830ec2c4 100644 --- a/workflow-tracing/build.gradle.kts +++ b/workflow-tracing/build.gradle.kts @@ -8,6 +8,7 @@ dependencies { api(libs.kotlinx.coroutines.core) api(project(":trace-encoder")) + api(project(":workflow-core")) api(project(":workflow-runtime")) compileOnly(libs.jetbrains.annotations) @@ -16,6 +17,9 @@ dependencies { implementation(libs.squareup.moshi.adapters) implementation(libs.squareup.okio) + testImplementation(libs.junit) + testImplementation(libs.kotlin.test.core) testImplementation(libs.kotlin.test.jdk) + testImplementation(libs.mockito.core) testImplementation(libs.mockito.kotlin) } diff --git a/workflow-ui/compose-tooling/build.gradle.kts b/workflow-ui/compose-tooling/build.gradle.kts index b9b1de012..e77a71685 100644 --- a/workflow-ui/compose-tooling/build.gradle.kts +++ b/workflow-ui/compose-tooling/build.gradle.kts @@ -26,7 +26,6 @@ tasks.withType { 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) @@ -34,7 +33,13 @@ dependencies { androidTestImplementation(project(":workflow-runtime")) - api(project(":workflow-ui:compose")) + implementation(libs.androidx.compose.foundation) + implementation(libs.androidx.compose.foundation.layout) + implementation(libs.androidx.compose.runtime) + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.ui.tooling.preview) - implementation(libs.androidx.compose.ui.tooling) + implementation(project(":workflow-ui:compose")) + implementation(project(":workflow-ui:core-android")) + implementation(project(":workflow-ui:core-common")) } diff --git a/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt index e4b5bfbb6..0075ac353 100644 --- a/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt @@ -1,17 +1,11 @@ :workflow-core :workflow-runtime :workflow-ui:compose -:workflow-ui:container-android -:workflow-ui:container-common :workflow-ui:core-android :workflow-ui:core-common -androidx.activity:activity-compose:1.3.0 -androidx.activity:activity-ktx:1.3.0 androidx.activity:activity:1.3.0 androidx.annotation:annotation-experimental:1.1.0 androidx.annotation:annotation:1.2.0 -androidx.appcompat:appcompat-resources:1.3.1 -androidx.appcompat:appcompat:1.3.1 androidx.arch.core:core-common:2.1.0 androidx.arch.core:core-runtime:2.1.0 androidx.autofill:autofill:1.0.0 @@ -20,47 +14,30 @@ androidx.compose.animation:animation-core:1.1.0-rc01 androidx.compose.animation:animation:1.1.0-rc01 androidx.compose.foundation:foundation-layout:1.1.0-rc01 androidx.compose.foundation:foundation:1.1.0-rc01 -androidx.compose.material:material-icons-core:1.0.0 -androidx.compose.material:material-ripple:1.0.0 -androidx.compose.material:material:1.0.0 androidx.compose.runtime:runtime-saveable:1.1.0-rc01 androidx.compose.runtime:runtime:1.1.0-rc01 androidx.compose.ui:ui-geometry:1.1.0-rc01 androidx.compose.ui:ui-graphics:1.1.0-rc01 androidx.compose.ui:ui-text:1.1.0-rc01 -androidx.compose.ui:ui-tooling-data:1.1.0-rc01 androidx.compose.ui:ui-tooling-preview:1.1.0-rc01 -androidx.compose.ui:ui-tooling:1.1.0-rc01 androidx.compose.ui:ui-unit:1.1.0-rc01 androidx.compose.ui:ui-util:1.1.0-rc01 androidx.compose.ui:ui:1.1.0-rc01 androidx.core:core-ktx:1.6.0 androidx.core:core:1.6.0 -androidx.cursoradapter:cursoradapter:1.0.0 -androidx.customview:customview:1.0.0 -androidx.drawerlayout:drawerlayout:1.0.0 -androidx.fragment:fragment:1.3.6 -androidx.interpolator:interpolator:1.0.0 androidx.lifecycle:lifecycle-common-java8:2.4.0 androidx.lifecycle:lifecycle-common:2.4.0 androidx.lifecycle:lifecycle-livedata-core:2.4.0 -androidx.lifecycle:lifecycle-livedata:2.4.0 androidx.lifecycle:lifecycle-runtime-ktx:2.4.0 androidx.lifecycle:lifecycle-runtime:2.4.0 -androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.0 androidx.lifecycle:lifecycle-viewmodel:2.4.0 -androidx.loader:loader:1.0.0 androidx.profileinstaller:profileinstaller:1.1.0-rc01 -androidx.savedstate:savedstate-ktx:1.1.0 androidx.savedstate:savedstate:1.1.0 androidx.startup:startup-runtime:1.0.0 androidx.tracing:tracing:1.0.0 androidx.transition:transition:1.4.1 -androidx.vectordrawable:vectordrawable-animated:1.1.0 -androidx.vectordrawable:vectordrawable:1.1.0 androidx.versionedparcelable:versionedparcelable:1.1.1 -androidx.viewpager:viewpager:1.0.0 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.6.10 diff --git a/workflow-ui/compose/build.gradle.kts b/workflow-ui/compose/build.gradle.kts index 5702530e8..9cee32f85 100644 --- a/workflow-ui/compose/build.gradle.kts +++ b/workflow-ui/compose/build.gradle.kts @@ -26,20 +26,29 @@ tasks.withType { dependencies { androidTestImplementation(libs.androidx.activity.core) - androidTestImplementation(libs.androidx.compose.ui) + androidTestImplementation(libs.androidx.compose.foundation) 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")) + androidTestImplementation(project(":workflow-ui:container-android")) androidTestImplementation(project(":workflow-ui:internal-testing-compose")) - api(libs.androidx.compose.foundation) + api(libs.androidx.compose.runtime) + api(libs.kotlin.common) - api(project(":workflow-core")) - api(project(":workflow-ui:container-android")) api(project(":workflow-ui:core-android")) - - implementation(libs.androidx.savedstate) + api(project(":workflow-ui:core-common")) + + implementation(libs.androidx.compose.foundation.layout) + implementation(libs.androidx.compose.runtime.saveable) + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.lifecycle.common) + implementation(libs.androidx.lifecycle.core) + implementation(libs.kotlinx.coroutines.core) + implementation(libs.squareup.okio) + + implementation(project(":workflow-core")) + implementation(project(":workflow-runtime")) } diff --git a/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt index 10f5ab0a1..ea2b9ac6a 100644 --- a/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt @@ -1,22 +1,15 @@ :workflow-core :workflow-runtime -:workflow-ui:container-android -:workflow-ui:container-common :workflow-ui:core-android :workflow-ui:core-common androidx.activity:activity:1.3.0 androidx.annotation:annotation-experimental:1.1.0 androidx.annotation:annotation:1.2.0 -androidx.appcompat:appcompat-resources:1.3.1 -androidx.appcompat:appcompat:1.3.1 androidx.arch.core:core-common:2.1.0 androidx.arch.core:core-runtime:2.1.0 androidx.autofill:autofill:1.0.0 androidx.collection:collection:1.1.0 -androidx.compose.animation:animation-core:1.1.0-rc01 -androidx.compose.animation:animation:1.1.0-rc01 androidx.compose.foundation:foundation-layout:1.1.0-rc01 -androidx.compose.foundation:foundation:1.1.0-rc01 androidx.compose.runtime:runtime-saveable:1.1.0-rc01 androidx.compose.runtime:runtime:1.1.0-rc01 androidx.compose.ui:ui-geometry:1.1.0-rc01 @@ -27,30 +20,19 @@ androidx.compose.ui:ui-util:1.1.0-rc01 androidx.compose.ui:ui:1.1.0-rc01 androidx.core:core-ktx:1.6.0 androidx.core:core:1.6.0 -androidx.cursoradapter:cursoradapter:1.0.0 -androidx.customview:customview:1.0.0 -androidx.drawerlayout:drawerlayout:1.0.0 -androidx.fragment:fragment:1.3.6 -androidx.interpolator:interpolator:1.0.0 androidx.lifecycle:lifecycle-common-java8:2.4.0 androidx.lifecycle:lifecycle-common:2.4.0 androidx.lifecycle:lifecycle-livedata-core:2.4.0 -androidx.lifecycle:lifecycle-livedata:2.4.0 androidx.lifecycle:lifecycle-runtime-ktx:2.4.0 androidx.lifecycle:lifecycle-runtime:2.4.0 -androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.0 androidx.lifecycle:lifecycle-viewmodel:2.4.0 -androidx.loader:loader:1.0.0 androidx.profileinstaller:profileinstaller:1.1.0-rc01 androidx.savedstate:savedstate:1.1.0 androidx.startup:startup-runtime:1.0.0 androidx.tracing:tracing:1.0.0 androidx.transition:transition:1.4.1 -androidx.vectordrawable:vectordrawable-animated:1.1.0 -androidx.vectordrawable:vectordrawable:1.1.0 androidx.versionedparcelable:versionedparcelable:1.1.1 -androidx.viewpager:viewpager:1.0.0 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.6.10 diff --git a/workflow-ui/container-android/build.gradle.kts b/workflow-ui/container-android/build.gradle.kts index 38d404a21..f744c5bb7 100644 --- a/workflow-ui/container-android/build.gradle.kts +++ b/workflow-ui/container-android/build.gradle.kts @@ -9,21 +9,15 @@ plugins { dependencies { androidTestImplementation(libs.truth) - api(libs.androidx.transition) api(libs.kotlin.jdk6) - api(project(":workflow-core")) api(project(":workflow-ui:container-common")) - api(project(":workflow-ui:core-android")) + api(project(":workflow-ui:core-common")) - implementation(libs.androidx.activity.core) implementation(libs.androidx.appcompat) - implementation(libs.androidx.fragment.core) - implementation(libs.androidx.savedstate) - implementation(libs.kotlinx.coroutines.android) - implementation(libs.kotlinx.coroutines.core) + implementation(libs.androidx.lifecycle.common) - implementation(project(":workflow-runtime")) + implementation(project(":workflow-ui:core-android")) testImplementation(libs.androidx.test.core) testImplementation(libs.junit) @@ -31,5 +25,6 @@ dependencies { testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.mockito.kotlin) testImplementation(libs.robolectric) + testImplementation(libs.robolectric.annotations) testImplementation(libs.truth) } diff --git a/workflow-ui/container-android/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/container-android/dependencies/releaseRuntimeClasspath.txt index 784bccf30..3e497d5e1 100644 --- a/workflow-ui/container-android/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/container-android/dependencies/releaseRuntimeClasspath.txt @@ -23,7 +23,6 @@ androidx.lifecycle:lifecycle-livedata-core:2.4.0 androidx.lifecycle:lifecycle-livedata:2.4.0 androidx.lifecycle:lifecycle-runtime-ktx:2.4.0 androidx.lifecycle:lifecycle-runtime:2.4.0 -androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.0 androidx.lifecycle:lifecycle-viewmodel:2.4.0 androidx.loader:loader:1.0.0 diff --git a/workflow-ui/container-common/build.gradle.kts b/workflow-ui/container-common/build.gradle.kts index 4a514c473..239b9bc25 100644 --- a/workflow-ui/container-common/build.gradle.kts +++ b/workflow-ui/container-common/build.gradle.kts @@ -5,10 +5,11 @@ plugins { dependencies { api(libs.kotlin.jdk6) - api(libs.squareup.okio) api(project(":workflow-ui:core-common")) + testImplementation(libs.junit) + testImplementation(libs.kotlin.test.core) testImplementation(libs.kotlin.test.jdk) testImplementation(libs.truth) } diff --git a/workflow-ui/core-android/build.gradle.kts b/workflow-ui/core-android/build.gradle.kts index d42bd65de..993fbb53b 100644 --- a/workflow-ui/core-android/build.gradle.kts +++ b/workflow-ui/core-android/build.gradle.kts @@ -10,10 +10,10 @@ dependencies { androidTestImplementation(libs.androidx.appcompat) androidTestImplementation(libs.truth) - api(libs.androidx.transition) + api(libs.androidx.lifecycle.common) + api(libs.androidx.savedstate) api(libs.kotlin.jdk6) - api(project(":workflow-core")) // Needs to be API for the WorkflowInterceptor argument to WorkflowRunner.Config. api(project(":workflow-runtime")) api(project(":workflow-ui:core-common")) @@ -22,20 +22,25 @@ dependencies { implementation(libs.androidx.activity.core) implementation(libs.androidx.core) - implementation(libs.androidx.fragment.core) + implementation(libs.androidx.lifecycle.core) implementation(libs.androidx.lifecycle.ktx) - implementation(libs.androidx.lifecycle.viewmodel.core) - implementation(libs.androidx.lifecycle.viewmodel.ktx) - implementation(libs.androidx.savedstate) + implementation(libs.androidx.lifecycle.viewmodel.savedstate) + implementation(libs.androidx.transition) implementation(libs.kotlinx.coroutines.android) implementation(libs.kotlinx.coroutines.core) + implementation(libs.squareup.okio) + + implementation(project(":workflow-core")) testImplementation(libs.androidx.lifecycle.testing) testImplementation(libs.androidx.test.core) testImplementation(libs.junit) + testImplementation(libs.kotlin.test.core) testImplementation(libs.kotlin.test.jdk) testImplementation(libs.kotlinx.coroutines.test) + testImplementation(libs.mockito.core) testImplementation(libs.mockito.kotlin) testImplementation(libs.robolectric) + testImplementation(libs.robolectric.annotations) testImplementation(libs.truth) } diff --git a/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt index aae04f5f6..1cdb7915a 100644 --- a/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt @@ -9,22 +9,16 @@ androidx.arch.core:core-runtime:2.1.0 androidx.collection:collection:1.1.0 androidx.core:core-ktx:1.6.0 androidx.core:core:1.6.0 -androidx.customview:customview:1.0.0 -androidx.fragment:fragment:1.3.6 androidx.lifecycle:lifecycle-common:2.4.0 androidx.lifecycle:lifecycle-livedata-core:2.4.0 -androidx.lifecycle:lifecycle-livedata:2.4.0 androidx.lifecycle:lifecycle-runtime-ktx:2.4.0 androidx.lifecycle:lifecycle-runtime:2.4.0 -androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.0 androidx.lifecycle:lifecycle-viewmodel:2.4.0 -androidx.loader:loader:1.0.0 androidx.savedstate:savedstate:1.1.0 androidx.tracing:tracing:1.0.0 androidx.transition:transition:1.4.1 androidx.versionedparcelable:versionedparcelable:1.1.1 -androidx.viewpager:viewpager:1.0.0 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.6.10 diff --git a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/WorkflowLayout.kt b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/WorkflowLayout.kt index e2d1d23e6..ab25c0338 100644 --- a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/WorkflowLayout.kt +++ b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/WorkflowLayout.kt @@ -19,7 +19,6 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch diff --git a/workflow-ui/core-common/build.gradle.kts b/workflow-ui/core-common/build.gradle.kts index a15562ccc..ba8a9c332 100644 --- a/workflow-ui/core-common/build.gradle.kts +++ b/workflow-ui/core-common/build.gradle.kts @@ -8,6 +8,8 @@ dependencies { api(libs.kotlinx.coroutines.core) api(libs.squareup.okio) + testImplementation(libs.junit) + testImplementation(libs.kotlin.test.core) testImplementation(libs.kotlin.test.jdk) testImplementation(libs.truth) } diff --git a/workflow-ui/internal-testing-android/build.gradle.kts b/workflow-ui/internal-testing-android/build.gradle.kts index bb9ab2db3..d2fd2b041 100644 --- a/workflow-ui/internal-testing-android/build.gradle.kts +++ b/workflow-ui/internal-testing-android/build.gradle.kts @@ -9,18 +9,27 @@ plugins { dependencies { api(libs.androidx.appcompat) + api(libs.androidx.lifecycle.core) api(libs.androidx.test.core) api(libs.androidx.test.espresso.core) + api(libs.androidx.test.espresso.idlingResource) api(libs.androidx.test.junit) api(libs.androidx.test.runner) api(libs.androidx.test.truth) + api(libs.junit) api(libs.kotlin.jdk6) + api(libs.kotlinx.coroutines.core) api(libs.kotlinx.coroutines.test) api(libs.truth) api(project(":workflow-ui:core-android")) + api(project(":workflow-ui:core-common")) + implementation(libs.androidx.lifecycle.common) implementation(libs.squareup.leakcanary.instrumentation) + implementation(libs.squareup.leakcanary.objectwatcher.android) + testImplementation(libs.hamcrest) testImplementation(libs.robolectric) + testImplementation(libs.robolectric.annotations) } diff --git a/workflow-ui/radiography/build.gradle.kts b/workflow-ui/radiography/build.gradle.kts index 209dfa3a7..6e8c369f7 100644 --- a/workflow-ui/radiography/build.gradle.kts +++ b/workflow-ui/radiography/build.gradle.kts @@ -12,16 +12,8 @@ dependencies { androidTestImplementation(project(":workflow-ui:container-android")) - api(libs.kotlin.jdk6) - api(libs.squareup.radiography) + implementation(libs.squareup.radiography) - api(project(":workflow-ui:core-android")) - - implementation(libs.androidx.activity.core) - implementation(libs.androidx.fragment.core) - implementation(libs.androidx.savedstate) - implementation(libs.kotlinx.coroutines.android) - implementation(libs.kotlinx.coroutines.core) - - implementation(project(":workflow-runtime")) + implementation(project(":workflow-ui:core-android")) + implementation(project(":workflow-ui:core-common")) } diff --git a/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt index 7fb5246c0..d709babf5 100644 --- a/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt @@ -10,22 +10,16 @@ androidx.arch.core:core-runtime:2.1.0 androidx.collection:collection:1.1.0 androidx.core:core-ktx:1.6.0 androidx.core:core:1.6.0 -androidx.customview:customview:1.0.0 -androidx.fragment:fragment:1.3.6 androidx.lifecycle:lifecycle-common:2.4.0 androidx.lifecycle:lifecycle-livedata-core:2.4.0 -androidx.lifecycle:lifecycle-livedata:2.4.0 androidx.lifecycle:lifecycle-runtime-ktx:2.4.0 androidx.lifecycle:lifecycle-runtime:2.4.0 -androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.0 androidx.lifecycle:lifecycle-viewmodel:2.4.0 -androidx.loader:loader:1.0.0 androidx.savedstate:savedstate:1.1.0 androidx.tracing:tracing:1.0.0 androidx.transition:transition:1.4.1 androidx.versionedparcelable:versionedparcelable:1.1.1 -androidx.viewpager:viewpager:1.0.0 com.squareup.curtains:curtains:1.2.1 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0