Skip to content

Commit ff89cd0

Browse files
RBusarowRBusarow
authored
Merge pull request #848 from square/rick/dependency_cleanup_2
transitive dependency cleanup
2 parents 7b124cd + 5d51217 commit ff89cd0

File tree

48 files changed

+331
-259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+331
-259
lines changed

‎benchmarks/dungeon-benchmark/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ android {
3838
}
3939

4040
dependencies {
41-
implementation(libs.androidx.test.junit)
41+
implementation(libs.androidx.macro.benchmark)
4242
implementation(libs.androidx.test.espresso.core)
43+
implementation(libs.androidx.test.junit)
4344
implementation(libs.androidx.test.uiautomator)
44-
implementation(libs.androidx.macro.benchmark)
4545
}
4646

4747
androidComponents {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ android {
4747
}
4848

4949
dependencies {
50+
implementation(libs.androidx.macro.benchmark)
51+
implementation(libs.androidx.test.espresso.core)
52+
implementation(libs.androidx.test.junit)
53+
implementation(libs.androidx.test.uiautomator)
54+
5055
implementation(project(":benchmarks:performance-poetry:complex-poetry"))
5156
implementation(project(":samples:containers:poetry"))
5257
implementation(project(":workflow-core"))
53-
54-
implementation(libs.androidx.test.junit)
55-
implementation(libs.androidx.test.espresso.core)
56-
implementation(libs.androidx.test.uiautomator)
57-
implementation(libs.androidx.macro.benchmark)
5858
}
5959

6060
androidComponents {

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,33 @@ android {
4646
}
4747

4848
dependencies {
49-
debugImplementation(libs.squareup.leakcanary.android)
49+
androidTestImplementation(libs.androidx.test.espresso.core)
50+
androidTestImplementation(libs.androidx.test.junit)
51+
52+
androidTestImplementation(project(":workflow-ui:internal-testing-android"))
5053

5154
// API on an app module so these are transitive dependencies for the benchmarks.
5255
api(project(":samples:containers:android"))
56+
api(project(":samples:containers:common"))
5357
api(project(":samples:containers:poetry"))
58+
api(project(":workflow-core"))
59+
api(project(":workflow-runtime"))
5460
api(project(":workflow-ui:core-android"))
61+
api(project(":workflow-ui:core-common"))
62+
63+
debugImplementation(libs.squareup.leakcanary.android)
5564

5665
implementation(libs.androidx.activity.ktx)
5766
implementation(libs.androidx.appcompat)
67+
implementation(libs.androidx.lifecycle.viewmodel.core)
68+
implementation(libs.androidx.lifecycle.viewmodel.savedstate)
5869
// Used to side load Baseline Profile when Benchmarking and not installed by Play Store.
5970
implementation(libs.androidx.profileinstaller)
6071
implementation(libs.androidx.recyclerview)
72+
implementation(libs.androidx.savedstate)
6173
implementation(libs.androidx.test.uiautomator)
74+
implementation(libs.androidx.tracing.core)
6275
implementation(libs.androidx.tracing.ktx)
76+
implementation(libs.kotlinx.coroutines.core)
6377
implementation(libs.timber)
64-
65-
androidTestImplementation(project(":workflow-ui:internal-testing-android"))
66-
androidTestImplementation(libs.androidx.test.espresso.core)
67-
androidTestImplementation(libs.androidx.test.junit)
6878
}

‎gradle/libs.versions.toml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ targetSdk = "30"
99
androidx-activity = "1.3.0"
1010
androidx-appcompat = "1.3.1"
1111
androidx-benchmark = "1.1.0-rc03"
12+
androidx-cardview = "1.0.0"
1213
androidx-compose = "1.1.0-rc01"
1314
androidx-compose-compiler = "1.1.0-rc02"
1415
androidx-constraintlayout = "2.1.2"
@@ -108,15 +109,22 @@ androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref
108109

109110
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
110111

111-
androidx-macro-benchmark = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark" }
112+
androidx-cardview = { module = "androidx.cardview:cardview", version.ref = "androidx-cardview" }
112113

113114
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose" }
115+
androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidx-compose" }
114116

115117
androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "androidx-compose" }
116118

119+
androidx-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "androidx-compose" }
120+
androidx-compose-runtime-saveable = { module = "androidx.compose.runtime:runtime-saveable", version.ref = "androidx-compose" }
121+
117122
androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose" }
123+
androidx-compose-ui-geometry = { module = "androidx.compose.ui:ui-geometry", version.ref = "androidx-compose" }
124+
androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics", version.ref = "androidx-compose" }
118125
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-compose" }
119126
androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose" }
127+
androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose" }
120128

121129
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
122130

@@ -127,12 +135,16 @@ androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref
127135

128136
androidx-gridlayout = { module = "androidx.gridlayout:gridlayout", version.ref = "androidx-gridlayout" }
129137

138+
androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidx-lifecycle" }
139+
androidx-lifecycle-core = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "androidx-lifecycle" }
130140
androidx-lifecycle-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
131141
androidx-lifecycle-testing = { module = "androidx.lifecycle:lifecycle-runtime-testing", version.ref = "androidx-lifecycle" }
132142
androidx-lifecycle-viewmodel-core = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
133143
androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
134144
androidx-lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" }
135145

146+
androidx-macro-benchmark = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark" }
147+
136148
androidx-profileinstaller = { module = "androidx.profileinstaller:profileinstaller", version.ref = "androidx-profileinstaller" }
137149

138150
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
149161

150162
androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.2.0"
151163

164+
androidx-tracing-core = { module = "androidx.tracing:tracing", version.ref = "androidx-tracing" }
152165
androidx-tracing-ktx = { module = "androidx.tracing:tracing-ktx", version.ref = "androidx-tracing" }
153166

154167
androidx-transition = { module = "androidx.transition:transition", version.ref = "androidx-transition" }
@@ -178,6 +191,7 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
178191
kotlin-serialization-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
179192
kotlin-test-annotations = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlin" }
180193
kotlin-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlin" }
194+
kotlin-test-core = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
181195
kotlin-test-jdk = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
182196

183197
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 =
196210
lanterna = "com.googlecode.lanterna:lanterna:3.1.1"
197211

198212
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito-core" }
199-
200213
mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito-kotlin" }
201214

202215
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
203216

217+
reactivestreams = "org.reactivestreams:reactive-streams:1.0.3"
218+
204219
robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
220+
robolectric-annotations = { module = "org.robolectric:annotations", version.ref = "robolectric" }
205221

206222
rxjava2-rxandroid = { module = "io.reactivex.rxjava2:rxandroid", version.ref = "rxjava2-android" }
207223
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
212228

213229
squareup-leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "squareup-leakcanary" }
214230
squareup-leakcanary-instrumentation = { module = "com.squareup.leakcanary:leakcanary-android-instrumentation", version.ref = "squareup-leakcanary" }
231+
squareup-leakcanary-objectwatcher-android = { module = "com.squareup.leakcanary:leakcanary-object-watcher-android-core", version.ref = "squareup-leakcanary" }
215232

216233
squareup-moshi = { module = "com.squareup.moshi:moshi", version.ref = "squareup-moshi" }
217234
squareup-moshi-adapters = { module = "com.squareup.moshi:moshi-adapters", version.ref = "squareup-moshi" }

‎internal-testing-utils/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ plugins {
66
dependencies {
77
implementation(libs.kotlin.jdk8)
88

9-
testImplementation(libs.kotlin.test.jdk)
109
testImplementation(libs.junit)
10+
testImplementation(libs.kotlin.test.core)
11+
testImplementation(libs.kotlin.test.jdk)
1112
testImplementation(libs.truth)
1213
}

‎samples/compose-samples/build.gradle.kts

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,37 @@ android {
1919
}
2020

2121
dependencies {
22+
androidTestImplementation(libs.androidx.activity.core)
23+
androidTestImplementation(libs.androidx.compose.ui)
24+
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
25+
androidTestImplementation(libs.androidx.test.core)
26+
androidTestImplementation(libs.androidx.test.truth)
27+
androidTestImplementation(libs.kotlin.test.jdk)
28+
29+
androidTestImplementation(project(":workflow-runtime"))
30+
2231
debugImplementation(libs.squareup.leakcanary.android)
2332

24-
implementation(project(":workflow-ui:compose"))
25-
implementation(project(":workflow-ui:compose-tooling"))
26-
implementation(project(":workflow-ui:core-android"))
2733
implementation(libs.androidx.activity.compose)
34+
implementation(libs.androidx.activity.core)
35+
implementation(libs.androidx.compose.foundation)
36+
implementation(libs.androidx.compose.foundation.layout)
2837
implementation(libs.androidx.compose.material)
29-
implementation(libs.androidx.compose.ui.tooling)
38+
implementation(libs.androidx.compose.runtime)
3039
implementation(libs.androidx.compose.ui)
40+
implementation(libs.androidx.compose.ui.geometry)
41+
implementation(libs.androidx.compose.ui.graphics)
42+
implementation(libs.androidx.compose.ui.tooling)
43+
implementation(libs.androidx.compose.ui.tooling.preview)
3144
implementation(libs.androidx.lifecycle.viewmodel.ktx)
3245
implementation(libs.androidx.lifecycle.viewmodel.savedstate)
3346
implementation(libs.androidx.viewbinding)
47+
implementation(libs.kotlin.common)
3448
// For the LayoutInspector.
3549
implementation(libs.kotlin.reflect)
3650

37-
androidTestImplementation(project(":workflow-runtime"))
38-
androidTestImplementation(libs.androidx.activity.core)
39-
androidTestImplementation(libs.androidx.compose.ui)
40-
androidTestImplementation(libs.kotlin.test.jdk)
41-
androidTestImplementation(libs.androidx.test.core)
42-
androidTestImplementation(libs.androidx.test.truth)
43-
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
51+
implementation(project(":workflow-ui:compose"))
52+
implementation(project(":workflow-ui:compose-tooling"))
53+
implementation(project(":workflow-ui:core-android"))
54+
implementation(project(":workflow-ui:core-common"))
4455
}

‎samples/containers/android/build.gradle.kts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ android {
1111
}
1212

1313
dependencies {
14-
api(project(":workflow-core"))
15-
api(project(":workflow-ui:container-android"))
16-
api(project(":samples:containers:common"))
14+
androidTestImplementation(libs.androidx.activity.core)
15+
androidTestImplementation(libs.androidx.compose.ui)
16+
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
17+
androidTestImplementation(libs.androidx.test.core)
18+
androidTestImplementation(libs.androidx.test.truth)
19+
androidTestImplementation(libs.kotlin.test.jdk)
1720

1821
api(libs.androidx.transition)
1922
api(libs.kotlin.jdk6)
2023

21-
implementation(project(":workflow-runtime"))
24+
api(project(":samples:containers:common"))
25+
api(project(":workflow-ui:core-android"))
26+
api(project(":workflow-ui:core-common"))
27+
2228
implementation(libs.androidx.appcompat)
29+
implementation(libs.androidx.core)
2330
implementation(libs.androidx.savedstate)
2431
implementation(libs.kotlinx.coroutines.android)
2532
implementation(libs.kotlinx.coroutines.core)
26-
27-
androidTestImplementation(libs.androidx.activity.core)
28-
androidTestImplementation(libs.androidx.compose.ui)
29-
androidTestImplementation(libs.kotlin.test.jdk)
30-
androidTestImplementation(libs.androidx.test.core)
31-
androidTestImplementation(libs.androidx.test.truth)
32-
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
3333
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ android {
1414
dependencies {
1515
debugImplementation(libs.squareup.leakcanary.android)
1616

17-
implementation(project(":samples:containers:android"))
18-
implementation(project(":samples:containers:poetry"))
19-
implementation(project(":workflow-ui:core-android"))
20-
2117
implementation(libs.androidx.activity.ktx)
2218
implementation(libs.androidx.recyclerview)
19+
20+
implementation(project(":samples:containers:android"))
21+
implementation(project(":samples:containers:poetry"))
2322
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
debugImplementation(libs.squareup.leakcanary.android)
1616

1717
implementation(libs.androidx.activity.ktx)
18+
1819
implementation(project(":samples:containers:android"))
1920
implementation(project(":samples:containers:poetry"))
20-
implementation(project(":workflow-ui:core-android"))
2121
}

‎samples/containers/common/build.gradle.kts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ plugins {
33
}
44

55
dependencies {
6-
implementation(project(":workflow-ui:container-common"))
7-
implementation(project(":workflow-core"))
6+
api(project(":workflow-ui:core-common"))
87

98
implementation(libs.kotlin.jdk6)
109

11-
testImplementation(libs.kotlin.test.jdk)
1210
testImplementation(libs.hamcrest)
1311
testImplementation(libs.junit)
12+
testImplementation(libs.kotlin.test.jdk)
1413
testImplementation(libs.truth)
15-
testImplementation(project(":workflow-testing"))
1614
}

0 commit comments

Comments
 (0)