Skip to content

Commit 01217d7

Browse files
authored
Merge pull request #14710 from woocommerce/removed-unused-depend
Remove unused dependencies and optimize dependency scopes
2 parents 6b122a7 + dea9586 commit 01217d7

File tree

9 files changed

+37
-47
lines changed

9 files changed

+37
-47
lines changed

RELEASE-NOTES.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
*** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
44
23.5
55
-----
6-
6+
- [Internal][Wear] Remove unused dependencies and optimize dependency scopes [https://github.com/woocommerce/woocommerce-android/pull/14710]
7+
- [Internal] Remove unused dependencies and optimize dependency scopes [https://github.com/woocommerce/woocommerce-android/pull/14710]
78

89
23.4
910
-----

WooCommerce-Wear/build.gradle

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,10 @@ dependencies {
135135
exclude group: "com.mcxiaoke.volley"
136136
exclude group: "com.android.support"
137137
}
138-
implementation(libs.automattic.tracks.android)
139138
implementation(libs.automattic.tracks.crashlogging)
140139

141140
// WearOS
142141
implementation(libs.google.play.services.wearable)
143-
implementation(libs.androidx.wear.tiles.main)
144-
implementation(libs.androidx.wear.tiles.material)
145-
implementation(libs.google.horologist.compose.tools)
146-
implementation(libs.google.horologist.tiles)
147142
implementation(libs.google.horologist.compose.layout)
148143
implementation(libs.androidx.wear.watchface.complications.data.source.ktx)
149144
implementation(libs.androidx.wear.compose.material)
@@ -164,30 +159,26 @@ dependencies {
164159
// Android Support
165160
implementation(libs.androidx.work.runtime.ktx)
166161
implementation(libs.androidx.lifecycle.viewmodel.savedstate)
167-
implementation(libs.androidx.lifecycle.livedata.ktx)
168162
implementation(libs.androidx.core.splashscreen)
169163
implementation(libs.androidx.navigation.compose)
170164
implementation(libs.androidx.activity.compose)
171165
implementation(libs.androidx.preference.ktx)
172166
implementation(libs.androidx.datastore.preferences)
173-
implementation(libs.androidx.datastore.main)
174167
implementation(libs.google.gson)
175168

176169
// Coroutines
177170
implementation(libs.kotlinx.coroutines.core)
178-
implementation(libs.kotlinx.coroutines.android)
171+
runtimeOnly(libs.kotlinx.coroutines.android)
179172
implementation(libs.kotlinx.coroutines.play.services)
180173
testImplementation(libs.kotlinx.coroutines.test)
181174

182175
// Dagger & Hilt
183176
implementation(libs.google.dagger.hilt.android.main)
184-
implementation(libs.androidx.hilt.navigation.fragment)
185-
implementation(libs.androidx.hilt.common)
186-
implementation(libs.androidx.hilt.work)
187177
implementation(libs.androidx.hilt.navigation.compose)
178+
compileOnly(libs.androidx.hilt.common)
179+
implementation(libs.androidx.hilt.work)
188180
ksp(libs.androidx.hilt.compiler)
189181
ksp(libs.google.dagger.hilt.compiler)
190-
implementation(libs.google.dagger.android.support)
191182
ksp(libs.google.dagger.android.processor)
192183

193184
// Testing

WooCommerce/build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -281,20 +281,18 @@ dependencies {
281281
// Dagger
282282
implementation(libs.google.dagger.hilt.android.main)
283283
implementation(libs.androidx.hilt.navigation.fragment)
284-
implementation(libs.androidx.hilt.common)
284+
compileOnly(libs.androidx.hilt.common)
285285
implementation(libs.androidx.hilt.work)
286286

287287
ksp(libs.androidx.hilt.compiler)
288288
ksp(libs.google.dagger.hilt.compiler)
289-
implementation(libs.google.dagger.android.support)
290289
ksp(libs.google.dagger.android.processor)
291290

292291
implementation(libs.mpandroidchart)
293292

294293
implementation(libs.bumptech.glide.main)
295294
ksp(libs.bumptech.glide.compiler)
296295
implementation(libs.bumptech.glide.volley.integration)
297-
implementation(libs.bumptech.glide.avif.integration)
298296
implementation(libs.google.play.app.update)
299297
implementation(libs.google.play.review)
300298

@@ -350,6 +348,7 @@ dependencies {
350348
exclude group: 'asm', module: 'asm'
351349
exclude group: 'org.json', module: 'json'
352350
}
351+
androidTestImplementation(libs.apache.http.client.android)
353352
constraints {
354353
androidTestImplementation(libs.wiremock) {
355354
because("newer versions of WireMock use Java APIs not available on Android")
@@ -376,7 +375,6 @@ dependencies {
376375
because("version shipped with WireMock 2.26.3 contains security vulnerabilities")
377376
}
378377
}
379-
androidTestImplementation(libs.apache.http.client.android)
380378

381379
implementation(libs.zendesk.support) {
382380
exclude group: 'com.android.support', module: 'support-annotations'
@@ -386,10 +384,11 @@ dependencies {
386384
implementation(libs.androidx.fragment.ktx)
387385
implementation(libs.androidx.lifecycle.viewmodel.savedstate)
388386
implementation(libs.androidx.lifecycle.process)
387+
implementation(libs.androidx.paging.runtime)
389388

390389
// Coroutines
391390
implementation(libs.kotlinx.coroutines.core)
392-
implementation(libs.kotlinx.coroutines.android)
391+
runtimeOnly(libs.kotlinx.coroutines.android)
393392
implementation(libs.kotlinx.coroutines.play.services)
394393
testImplementation(libs.kotlinx.coroutines.test)
395394

@@ -425,15 +424,15 @@ dependencies {
425424
implementation(libs.coil.svg)
426425

427426
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
428-
debugImplementation(libs.androidx.compose.ui.test.manifest)
427+
debugRuntimeOnly(libs.androidx.compose.ui.test.manifest)
429428

430429
coreLibraryDesugaring(libs.android.desugar)
431430

432431
// Lottie
433432
implementation(libs.lottie.compose)
434433

435434
// CameraX
436-
implementation(libs.androidx.camera.camera2)
435+
runtimeOnly(libs.androidx.camera.camera2)
437436
implementation(libs.androidx.camera.lifecycle)
438437
implementation(libs.androidx.camera.view)
439438

libs/apifaker/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,16 @@ dependencies {
3636

3737
implementation(platform(libs.androidx.compose.bom))
3838
implementation(libs.androidx.compose.material.main)
39-
implementation(libs.androidx.compose.runtime.livedata)
40-
implementation(libs.androidx.compose.ui.tooling.preview)
4139
implementation(libs.androidx.compose.material.icons.extended)
40+
implementation(libs.androidx.compose.ui.tooling.preview)
4241
debugImplementation(libs.androidx.compose.ui.tooling.main)
4342

44-
implementation(libs.google.gson)
43+
api(libs.google.gson)
4544

4645
implementation(project(":libs:fluxc"))
4746
implementation(project(":libs:fluxc-plugin"))
4847

4948
implementation(libs.androidx.room.runtime)
50-
implementation(libs.androidx.room.ktx)
5149
ksp(libs.androidx.room.compiler)
5250

5351
implementation(libs.google.dagger.hilt.android.main)

libs/cardreader/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@ android {
2828
}
2929

3030
dependencies {
31-
implementation(libs.stripe.terminal.taptopay)
31+
runtimeOnly(libs.stripe.terminal.taptopay)
3232
implementation(libs.stripe.terminal.core)
3333

3434
// Coroutines
3535
implementation(libs.kotlinx.coroutines.core)
36-
implementation(libs.kotlinx.coroutines.android)
36+
runtimeOnly(libs.kotlinx.coroutines.android)
3737

38+
testImplementation(libs.junit)
3839
testImplementation(libs.mockito.kotlin)
3940
testImplementation(libs.kotlin.test.junit)
4041
testImplementation(libs.assertj.core)

libs/fluxc-plugin/build.gradle

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ tasks.withType(KotlinCompile).configureEach {
4747
}
4848

4949
dependencies {
50-
implementation project(":libs:fluxc")
50+
api project(":libs:fluxc")
5151

5252
testFixturesCompileOnly project(":libs:fluxc")
5353
testFixturesCompileOnly libs.mockito.kotlin
@@ -57,6 +57,8 @@ dependencies {
5757
testFixturesCompileOnly libs.wordpress.utils
5858
testFixturesCompileOnly libs.assertj.core
5959
testFixturesCompileOnly libs.junit
60+
testFixturesCompileOnly libs.kotlinx.coroutines.core
61+
testFixturesCompileOnly libs.androidx.room.runtime
6062

6163
// WordPress libs
6264
implementation(libs.wordpress.utils) {
@@ -65,27 +67,28 @@ dependencies {
6567
exclude group: "com.android.support"
6668
}
6769

68-
api libs.wellsql
70+
implementation libs.androidx.core.ktx
71+
72+
implementation libs.wellsql
6973
kapt libs.wellsql.processor
7074

7175
// FluxC annotations
7276
api project(":libs:fluxc-annotations")
7377
kapt project(":libs:fluxc-processor")
7478

75-
implementation libs.google.gson
79+
api libs.google.gson
7680

7781
// Dagger
78-
implementation libs.google.dagger
82+
api libs.google.dagger
7983
ksp libs.google.dagger.compiler
8084
compileOnly libs.glassfish.javax.annotation
8185

8286
// Coroutines
8387
implementation libs.kotlinx.coroutines.core
84-
implementation libs.kotlinx.coroutines.android
88+
runtimeOnly libs.kotlinx.coroutines.android
8589

8690
implementation libs.androidx.room.runtime
8791
ksp libs.androidx.room.compiler
88-
api libs.androidx.room.ktx
8992

9093
testImplementation libs.junit
9194
testImplementation libs.robolectric
@@ -96,7 +99,7 @@ dependencies {
9699
testImplementation libs.kotlin.test.junit
97100

98101
androidTestImplementation libs.androidx.room.testing
99-
androidTestImplementation libs.androidx.test.main.runner
102+
androidTestRuntimeOnly libs.androidx.test.main.runner
100103
androidTestImplementation libs.androidx.test.ext.junit
101104
androidTestImplementation libs.assertj.core
102105
}

libs/fluxc-tests/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,5 @@ dependencies {
4848
testImplementation libs.mockito.kotlin
4949
testImplementation libs.assertj.core
5050
testImplementation libs.androidx.arch.core.testing
51+
testImplementation libs.androidx.paging.runtime
5152
}

libs/fluxc/build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,21 @@ dependencies {
8888
implementation libs.squareup.okhttp3.urlconnection
8989
implementation libs.squareup.okhttp3.tls
9090
api libs.volley
91-
implementation libs.google.gson
91+
api libs.google.gson
9292

9393
implementation libs.apache.commons.text
94-
api libs.androidx.paging.runtime
94+
implementation libs.androidx.paging.runtime
9595
implementation libs.androidx.room.runtime
9696
ksp libs.androidx.room.compiler
97-
implementation libs.androidx.room.ktx
9897

9998
// Dagger
100-
implementation libs.google.dagger
99+
api libs.google.dagger
101100
ksp libs.google.dagger.compiler
102101
compileOnly libs.glassfish.javax.annotation
103102

104103
// Coroutines
105104
implementation libs.kotlinx.coroutines.core
106-
implementation libs.kotlinx.coroutines.android
105+
runtimeOnly libs.kotlinx.coroutines.android
107106

108107
// Unit tests
109108
testImplementation libs.junit
@@ -113,7 +112,6 @@ dependencies {
113112
testImplementation libs.robolectric
114113
testImplementation libs.mockito.kotlin
115114
testImplementation libs.assertj.core
116-
testImplementation libs.androidx.arch.core.testing
117115
}
118116

119117
tasks.withType(KotlinCompile).configureEach {

libs/login/build.gradle

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,30 +35,28 @@ android {
3535
}
3636

3737
dependencies {
38-
implementation libs.wordpress.utils
38+
api libs.wordpress.utils
3939
implementation libs.gravatar
4040

41-
implementation libs.androidx.appcompat
41+
api libs.androidx.appcompat
4242

4343
implementation libs.androidx.constraintlayout.main
4444
implementation libs.google.material
4545

46-
implementation libs.androidx.core.ktx
47-
4846
api libs.google.play.services.auth
4947

50-
implementation project(":libs:fluxc")
48+
api project(":libs:fluxc")
5149

5250
implementation libs.bumptech.glide.main
5351
ksp libs.bumptech.glide.ksp
5452

5553
implementation libs.androidx.credentials.main
56-
implementation libs.androidx.credentials.play.service.auth
54+
runtimeOnly libs.androidx.credentials.play.service.auth
5755

5856
// Dagger
59-
implementation libs.google.dagger
57+
api libs.google.dagger
6058
ksp libs.google.dagger.compiler
61-
implementation libs.google.dagger.android.support
59+
api libs.google.dagger.android.support
6260
ksp libs.google.dagger.android.processor
6361

6462
testImplementation libs.junit

0 commit comments

Comments
 (0)