Skip to content

Commit 0c56aec

Browse files
authored
Merge pull request #1090 from wordpress-mobile/build/remove-unused-dependencies
[Dependency Analysis] Remove Unused Dependencies
2 parents bdd9858 + 48e2716 commit 0c56aec

File tree

8 files changed

+52
-17
lines changed

8 files changed

+52
-17
lines changed

app/build.gradle

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ dependencies {
4747
implementation project(':wordpress-shortcodes')
4848
implementation project(':media-placeholders')
4949

50-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion"
51-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesVersion"
52-
5350
implementation 'androidx.appcompat:appcompat:1.0.0'
5451
implementation "org.wordpress:utils:$wordpressUtilsVersion"
5552

@@ -60,3 +57,13 @@ dependencies {
6057
exclude group: 'com.android.support', module: 'support-annotations'
6158
}
6259
}
60+
61+
dependencyAnalysis {
62+
issues {
63+
onUnusedDependencies {
64+
// These dependency are not needed but kept to preserve the module's default configuration.
65+
exclude(":media-placeholders")
66+
exclude(":picasso-loader")
67+
}
68+
}
69+
}

aztec/build.gradle

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dependencies {
5252
implementation "org.ccil.cowan.tagsoup:tagsoup:$tagSoupVersion"
5353
implementation "org.jsoup:jsoup:$jSoupVersion"
5454

55-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
55+
implementation 'androidx.collection:collection:1.1.0'
5656
implementation 'com.google.android.material:material:1.0.0'
5757

5858
implementation "org.wordpress:utils:$wordpressUtilsVersion"
@@ -61,13 +61,6 @@ dependencies {
6161
testImplementation "org.robolectric:robolectric:$robolectricVersion"
6262
testImplementation 'androidx.test:core:1.4.0'
6363

64-
androidTestImplementation 'androidx.test:core:1.4.0'
65-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
66-
androidTestImplementation 'androidx.test:runner:1.2.0'
67-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0', {
68-
exclude group: 'com.android.support', module: 'support-annotations'
69-
}
70-
7164
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion"
7265
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesVersion"
7366

aztec/src/main/res/layout/aztec_format_bar_advanced.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118

119119
</RelativeLayout>
120120

121-
<androidx.legacy.widget.Space
121+
<Space
122122
android:layout_width="0dp"
123123
android:layout_height="wrap_content"
124124
android:layout_weight="1"/>

media-placeholders/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,15 @@ dependencies {
4343
testImplementation "org.robolectric:robolectric:$robolectricVersion"
4444
}
4545

46+
dependencyAnalysis {
47+
issues {
48+
onUnusedDependencies {
49+
// This dependency is actually needed otherwise the build fails in multiple places.
50+
exclude("androidx.appcompat:appcompat")
51+
}
52+
}
53+
}
54+
4655
project.afterEvaluate {
4756
publishing {
4857
publications {

picasso-loader/build.gradle

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,21 @@ android {
2525
dependencies {
2626
implementation aztecProjectDependency
2727

28-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
29-
implementation 'com.google.android.material:material:1.0.0'
28+
implementation 'androidx.collection:collection:1.1.0'
29+
implementation 'androidx.appcompat:appcompat:1.0.0'
3030

3131
implementation "com.squareup.picasso:picasso:$picassoVersion"
3232
}
3333

34+
dependencyAnalysis {
35+
issues {
36+
onUnusedDependencies {
37+
// This dependency is actually needed otherwise the build fails on 'aztec.tag'.
38+
exclude("androidx.appcompat:appcompat")
39+
}
40+
}
41+
}
42+
3443
project.afterEvaluate {
3544
publishing {
3645
publications {

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pluginManagement {
22
gradle.ext.kotlinVersion = '1.9.24'
33
gradle.ext.agpVersion = '8.1.0'
44
gradle.ext.automatticPublishToS3Version = '0.8.0'
5-
gradle.ext.dependencyAnalysisVersion = '1.28.0'
5+
gradle.ext.dependencyAnalysisVersion = '1.33.0'
66

77
plugins {
88
id "com.android.library" version gradle.ext.agpVersion

wordpress-comments/build.gradle

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,22 @@ android {
3838
dependencies {
3939
implementation aztecProjectDependency
4040

41-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
42-
implementation 'com.google.android.material:material:1.0.0'
41+
implementation 'androidx.appcompat:appcompat:1.0.0'
4342
implementation "org.wordpress:utils:$wordpressUtilsVersion"
4443

4544
testImplementation "junit:junit:$jUnitVersion"
4645
testImplementation "org.robolectric:robolectric:$robolectricVersion"
4746
}
4847

48+
dependencyAnalysis {
49+
issues {
50+
onUnusedDependencies {
51+
// This dependency is actually needed otherwise the build fails in multiple places.
52+
exclude("androidx.appcompat:appcompat")
53+
}
54+
}
55+
}
56+
4957
project.afterEvaluate {
5058
publishing {
5159
publications {

wordpress-shortcodes/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,15 @@ dependencies {
4343
testImplementation "org.robolectric:robolectric:$robolectricVersion"
4444
}
4545

46+
dependencyAnalysis {
47+
issues {
48+
onUnusedDependencies {
49+
// This dependency is actually needed otherwise the build fails in multiple places.
50+
exclude("androidx.appcompat:appcompat")
51+
}
52+
}
53+
}
54+
4655
project.afterEvaluate {
4756
publishing {
4857
publications {

0 commit comments

Comments
 (0)