Skip to content

Commit 0f05117

Browse files
dturnerdturner
authored
Merge pull request #1088 from SimonMarquis/cleanup-dependencies
Reduce overall build complexity
2 parents 41d307b + 046831d commit 0f05117

File tree

79 files changed

+248
-362
lines changed

Some content is hidden

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

79 files changed

+248
-362
lines changed

‎app-nia-catalog/build.gradle.kts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,10 @@ android {
6565
}
6666

6767
dependencies {
68+
implementation(libs.androidx.activity.compose)
69+
6870
implementation(projects.core.designsystem)
6971
implementation(projects.core.ui)
70-
implementation(libs.androidx.activity.compose)
7172
}
7273

7374
dependencyGuard {

‎app-nia-catalog/dependencies/releaseRuntimeClasspath.txt‎

Lines changed: 30 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
androidx.activity:activity-compose:1.8.0
22
androidx.activity:activity-ktx:1.8.0
33
androidx.activity:activity:1.8.0
4-
androidx.annotation:annotation-experimental:1.3.0
5-
androidx.annotation:annotation-jvm:1.6.0
6-
androidx.annotation:annotation:1.6.0
4+
androidx.annotation:annotation-experimental:1.3.1
5+
androidx.annotation:annotation-jvm:1.7.0
6+
androidx.annotation:annotation:1.7.0
77
androidx.appcompat:appcompat-resources:1.6.1
88
androidx.arch.core:core-common:2.2.0
99
androidx.arch.core:core-runtime:2.2.0
1010
androidx.autofill:autofill:1.0.0
1111
androidx.browser:browser:1.6.0
12-
androidx.collection:collection:1.2.0
12+
androidx.collection:collection-jvm:1.3.0
13+
androidx.collection:collection:1.3.0
1314
androidx.compose.animation:animation-android:1.5.4
1415
androidx.compose.animation:animation-core-android:1.5.4
1516
androidx.compose.animation:animation-core:1.5.4
@@ -26,7 +27,6 @@ androidx.compose.material:material-icons-extended:1.5.4
2627
androidx.compose.material:material-ripple-android:1.5.4
2728
androidx.compose.material:material-ripple:1.5.4
2829
androidx.compose.runtime:runtime-android:1.5.4
29-
androidx.compose.runtime:runtime-livedata:1.5.4
3030
androidx.compose.runtime:runtime-saveable-android:1.5.4
3131
androidx.compose.runtime:runtime-saveable:1.5.4
3232
androidx.compose.runtime:runtime:1.5.4
@@ -50,118 +50,54 @@ androidx.core:core-ktx:1.12.0
5050
androidx.core:core:1.12.0
5151
androidx.customview:customview-poolingcontainer:1.0.0
5252
androidx.customview:customview:1.0.0
53-
androidx.datastore:datastore-core:1.0.0
54-
androidx.datastore:datastore:1.0.0
55-
androidx.documentfile:documentfile:1.0.0
5653
androidx.emoji2:emoji2:1.4.0
5754
androidx.exifinterface:exifinterface:1.3.6
5855
androidx.fragment:fragment:1.5.1
5956
androidx.interpolator:interpolator:1.0.0
60-
androidx.legacy:legacy-support-core-utils:1.0.0
61-
androidx.lifecycle:lifecycle-common-java8:2.6.1
62-
androidx.lifecycle:lifecycle-common:2.6.1
63-
androidx.lifecycle:lifecycle-livedata-core:2.6.1
64-
androidx.lifecycle:lifecycle-livedata:2.6.1
65-
androidx.lifecycle:lifecycle-process:2.6.1
66-
androidx.lifecycle:lifecycle-runtime-ktx:2.6.1
67-
androidx.lifecycle:lifecycle-runtime:2.6.1
68-
androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1
69-
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1
70-
androidx.lifecycle:lifecycle-viewmodel:2.6.1
57+
androidx.lifecycle:lifecycle-common-java8:2.6.2
58+
androidx.lifecycle:lifecycle-common:2.6.2
59+
androidx.lifecycle:lifecycle-livedata-core:2.6.2
60+
androidx.lifecycle:lifecycle-livedata:2.6.2
61+
androidx.lifecycle:lifecycle-process:2.6.2
62+
androidx.lifecycle:lifecycle-runtime-ktx:2.6.2
63+
androidx.lifecycle:lifecycle-runtime:2.6.2
64+
androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2
65+
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2
66+
androidx.lifecycle:lifecycle-viewmodel:2.6.2
7167
androidx.loader:loader:1.0.0
72-
androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
7368
androidx.metrics:metrics-performance:1.0.0-alpha04
74-
androidx.print:print:1.0.0
75-
androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05
76-
androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05
7769
androidx.profileinstaller:profileinstaller:1.3.1
78-
androidx.room:room-common:2.6.0
79-
androidx.room:room-ktx:2.6.0
80-
androidx.room:room-runtime:2.6.0
8170
androidx.savedstate:savedstate-ktx:1.2.1
8271
androidx.savedstate:savedstate:1.2.1
83-
androidx.sqlite:sqlite-framework:2.4.0
84-
androidx.sqlite:sqlite:2.4.0
8572
androidx.startup:startup-runtime:1.1.1
86-
androidx.tracing:tracing-ktx:1.1.0
87-
androidx.tracing:tracing:1.1.0
73+
androidx.tracing:tracing:1.0.0
8874
androidx.vectordrawable:vectordrawable-animated:1.1.0
8975
androidx.vectordrawable:vectordrawable:1.1.0
9076
androidx.versionedparcelable:versionedparcelable:1.1.1
9177
androidx.viewpager:viewpager:1.0.0
92-
com.caverock:androidsvg-aar:1.4
93-
com.google.accompanist:accompanist-drawablepainter:0.30.1
94-
com.google.android.datatransport:transport-api:3.0.0
95-
com.google.android.datatransport:transport-backend-cct:3.1.8
96-
com.google.android.datatransport:transport-runtime:3.1.8
97-
com.google.android.gms:play-services-ads-identifier:18.0.0
98-
com.google.android.gms:play-services-base:18.0.1
99-
com.google.android.gms:play-services-basement:18.1.0
100-
com.google.android.gms:play-services-cloud-messaging:17.0.1
101-
com.google.android.gms:play-services-measurement-api:21.4.0
102-
com.google.android.gms:play-services-measurement-base:21.4.0
103-
com.google.android.gms:play-services-measurement-impl:21.4.0
104-
com.google.android.gms:play-services-measurement-sdk-api:21.4.0
105-
com.google.android.gms:play-services-measurement-sdk:21.4.0
106-
com.google.android.gms:play-services-measurement:21.4.0
107-
com.google.android.gms:play-services-stats:17.0.2
108-
com.google.android.gms:play-services-tasks:18.0.2
78+
com.google.accompanist:accompanist-drawablepainter:0.32.0
10979
com.google.code.findbugs:jsr305:3.0.2
110-
com.google.dagger:dagger-lint-aar:2.48.1
111-
com.google.dagger:dagger:2.48.1
112-
com.google.dagger:hilt-android:2.48.1
113-
com.google.dagger:hilt-core:2.48.1
114-
com.google.errorprone:error_prone_annotations:2.11.0
115-
com.google.firebase:firebase-analytics-ktx:21.4.0
116-
com.google.firebase:firebase-analytics:21.4.0
117-
com.google.firebase:firebase-annotations:16.2.0
118-
com.google.firebase:firebase-bom:32.4.0
119-
com.google.firebase:firebase-common-ktx:20.4.2
120-
com.google.firebase:firebase-common:20.4.2
121-
com.google.firebase:firebase-components:17.1.5
122-
com.google.firebase:firebase-datatransport:18.1.7
123-
com.google.firebase:firebase-encoders-json:18.0.0
124-
com.google.firebase:firebase-encoders-proto:16.0.0
125-
com.google.firebase:firebase-encoders:17.0.0
126-
com.google.firebase:firebase-iid-interop:17.1.0
127-
com.google.firebase:firebase-installations-interop:17.1.1
128-
com.google.firebase:firebase-installations:17.2.0
129-
com.google.firebase:firebase-measurement-connector:19.0.0
130-
com.google.firebase:firebase-messaging-ktx:23.3.0
131-
com.google.firebase:firebase-messaging:23.3.0
132-
com.google.guava:failureaccess:1.0.1
133-
com.google.guava:guava:31.1-android
134-
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
135-
com.google.j2objc:j2objc-annotations:1.3
136-
com.google.protobuf:protobuf-javalite:3.24.4
137-
com.google.protobuf:protobuf-kotlin-lite:3.24.4
138-
com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0
139-
com.squareup.okhttp3:logging-interceptor:4.12.0
80+
com.google.dagger:dagger-lint-aar:2.50
81+
com.google.dagger:dagger:2.50
82+
com.google.dagger:hilt-android:2.50
83+
com.google.dagger:hilt-core:2.50
84+
com.google.guava:listenablefuture:1.0
14085
com.squareup.okhttp3:okhttp:4.12.0
14186
com.squareup.okio:okio-jvm:3.6.0
14287
com.squareup.okio:okio:3.6.0
143-
com.squareup.retrofit2:retrofit:2.9.0
144-
io.coil-kt:coil-base:2.4.0
145-
io.coil-kt:coil-compose-base:2.4.0
146-
io.coil-kt:coil-compose:2.4.0
147-
io.coil-kt:coil-svg:2.4.0
148-
io.coil-kt:coil:2.4.0
88+
io.coil-kt:coil-base:2.5.0
89+
io.coil-kt:coil-compose-base:2.5.0
90+
io.coil-kt:coil-compose:2.5.0
91+
io.coil-kt:coil:2.5.0
14992
javax.inject:javax.inject:1
150-
org.checkerframework:checker-qual:3.12.0
151-
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10
93+
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.21
15294
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10
15395
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10
154-
org.jetbrains.kotlin:kotlin-stdlib:1.9.10
96+
org.jetbrains.kotlin:kotlin-stdlib:1.9.21
15597
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
15698
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
15799
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
158100
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
159-
org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3
160-
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.4.1
161-
org.jetbrains.kotlinx:kotlinx-datetime:0.4.1
162-
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0
163-
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.0
164-
org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.0
165-
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.0
166-
org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0
101+
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.5.0
102+
org.jetbrains.kotlinx:kotlinx-datetime:0.5.0
167103
org.jetbrains:annotations:23.0.0

‎app/build.gradle.kts‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ plugins {
2525
alias(libs.plugins.nowinandroid.android.application.firebase)
2626
id("com.google.android.gms.oss-licenses-plugin")
2727
alias(libs.plugins.baselineprofile)
28+
alias(libs.plugins.roborazzi)
2829
}
2930

3031
android {
@@ -96,47 +97,41 @@ dependencies {
9697
implementation(projects.core.data)
9798
implementation(projects.core.model)
9899
implementation(projects.core.analytics)
99-
100100
implementation(projects.sync.work)
101101

102-
androidTestImplementation(projects.core.testing)
103-
androidTestImplementation(projects.core.datastoreTest)
104-
androidTestImplementation(projects.core.dataTest)
105-
androidTestImplementation(projects.core.network)
106-
androidTestImplementation(libs.androidx.navigation.testing)
107-
androidTestImplementation(libs.accompanist.testharness)
108-
androidTestImplementation(kotlin("test"))
109-
debugImplementation(libs.androidx.compose.ui.testManifest)
110-
debugImplementation(projects.uiTestHiltManifest)
111-
112102
implementation(libs.androidx.activity.compose)
113-
implementation(libs.androidx.appcompat)
114103
implementation(libs.androidx.core.ktx)
115104
implementation(libs.androidx.core.splashscreen)
116-
implementation(libs.androidx.compose.runtime)
105+
implementation(libs.androidx.tracing.ktx)
117106
implementation(libs.androidx.lifecycle.runtimeCompose)
118-
implementation(libs.androidx.compose.runtime.tracing)
119107
implementation(libs.androidx.compose.material3.windowSizeClass)
120-
implementation(libs.androidx.hilt.navigation.compose)
121108
implementation(libs.androidx.navigation.compose)
122-
implementation(libs.androidx.window.manager)
123109
implementation(libs.androidx.profileinstaller)
124110
implementation(libs.kotlinx.coroutines.guava)
125111
implementation(libs.coil.kt)
126112

127-
baselineProfile(project(":benchmarks"))
113+
debugImplementation(libs.androidx.compose.ui.testManifest)
114+
debugImplementation(projects.uiTestHiltManifest)
115+
116+
kspTest(libs.hilt.compiler)
128117

129-
// Core functions
130-
testImplementation(projects.core.testing)
131-
testImplementation(projects.core.datastoreTest)
132118
testImplementation(projects.core.dataTest)
133-
testImplementation(projects.core.network)
134-
testImplementation(libs.androidx.navigation.testing)
119+
testImplementation(projects.core.testing)
135120
testImplementation(libs.accompanist.testharness)
121+
testImplementation(libs.hilt.android.testing)
136122
testImplementation(libs.work.testing)
137-
testImplementation(kotlin("test"))
138-
kspTest(libs.hilt.compiler)
139123

124+
testDemoImplementation(libs.robolectric)
125+
testDemoImplementation(libs.roborazzi)
126+
127+
androidTestImplementation(projects.core.testing)
128+
androidTestImplementation(projects.core.dataTest)
129+
androidTestImplementation(projects.core.datastoreTest)
130+
androidTestImplementation(libs.androidx.navigation.testing)
131+
androidTestImplementation(libs.accompanist.testharness)
132+
androidTestImplementation(libs.hilt.android.testing)
133+
134+
baselineProfile(projects.benchmarks)
140135
}
141136

142137
baselineProfile {

‎app/dependencies/prodReleaseRuntimeClasspath.txt‎

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
androidx.activity:activity-compose:1.8.0
22
androidx.activity:activity-ktx:1.8.0
33
androidx.activity:activity:1.8.0
4-
androidx.annotation:annotation-experimental:1.3.0
5-
androidx.annotation:annotation-jvm:1.6.0
6-
androidx.annotation:annotation:1.6.0
4+
androidx.annotation:annotation-experimental:1.3.1
5+
androidx.annotation:annotation-jvm:1.7.0
6+
androidx.annotation:annotation:1.7.0
77
androidx.appcompat:appcompat-resources:1.6.1
88
androidx.appcompat:appcompat:1.6.1
99
androidx.arch.core:core-common:2.2.0
1010
androidx.arch.core:core-runtime:2.2.0
1111
androidx.autofill:autofill:1.0.0
1212
androidx.browser:browser:1.6.0
13-
androidx.collection:collection-ktx:1.1.0
14-
androidx.collection:collection:1.2.0
13+
androidx.collection:collection-jvm:1.3.0
14+
androidx.collection:collection-ktx:1.3.0
15+
androidx.collection:collection:1.3.0
1516
androidx.compose.animation:animation-android:1.5.4
1617
androidx.compose.animation:animation-core-android:1.5.4
1718
androidx.compose.animation:animation-core:1.5.4
@@ -29,10 +30,8 @@ androidx.compose.material:material-icons-extended:1.5.4
2930
androidx.compose.material:material-ripple-android:1.5.4
3031
androidx.compose.material:material-ripple:1.5.4
3132
androidx.compose.runtime:runtime-android:1.5.4
32-
androidx.compose.runtime:runtime-livedata:1.5.4
3333
androidx.compose.runtime:runtime-saveable-android:1.5.4
3434
androidx.compose.runtime:runtime-saveable:1.5.4
35-
androidx.compose.runtime:runtime-tracing:1.0.0-alpha03
3635
androidx.compose.runtime:runtime:1.5.4
3736
androidx.compose.ui:ui-android:1.5.4
3837
androidx.compose.ui:ui-geometry-android:1.5.4
@@ -74,9 +73,7 @@ androidx.interpolator:interpolator:1.0.0
7473
androidx.legacy:legacy-support-core-utils:1.0.0
7574
androidx.lifecycle:lifecycle-common-java8:2.6.2
7675
androidx.lifecycle:lifecycle-common:2.6.2
77-
androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.2
7876
androidx.lifecycle:lifecycle-livedata-core:2.6.2
79-
androidx.lifecycle:lifecycle-livedata-ktx:2.6.2
8077
androidx.lifecycle:lifecycle-livedata:2.6.2
8178
androidx.lifecycle:lifecycle-process:2.6.2
8279
androidx.lifecycle:lifecycle-runtime-compose:2.6.2
@@ -100,28 +97,25 @@ androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05
10097
androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05
10198
androidx.profileinstaller:profileinstaller:1.3.1
10299
androidx.resourceinspection:resourceinspection-annotation:1.0.1
103-
androidx.room:room-common:2.6.0
104-
androidx.room:room-ktx:2.6.0
105-
androidx.room:room-runtime:2.6.0
100+
androidx.room:room-common:2.6.1
101+
androidx.room:room-ktx:2.6.1
102+
androidx.room:room-runtime:2.6.1
106103
androidx.savedstate:savedstate-ktx:1.2.1
107104
androidx.savedstate:savedstate:1.2.1
108105
androidx.sqlite:sqlite-framework:2.4.0
109106
androidx.sqlite:sqlite:2.4.0
110107
androidx.startup:startup-runtime:1.1.1
111-
androidx.tracing:tracing-ktx:1.2.0-alpha02
112-
androidx.tracing:tracing-perfetto-common:1.0.0-alpha11
113-
androidx.tracing:tracing-perfetto:1.0.0-alpha11
114-
androidx.tracing:tracing:1.2.0-alpha02
108+
androidx.tracing:tracing-ktx:1.1.0
109+
androidx.tracing:tracing:1.1.0
115110
androidx.vectordrawable:vectordrawable-animated:1.1.0
116111
androidx.vectordrawable:vectordrawable:1.1.0
117112
androidx.versionedparcelable:versionedparcelable:1.1.1
118113
androidx.viewpager:viewpager:1.0.0
119-
androidx.window.extensions.core:core:1.0.0
120-
androidx.window:window:1.1.0
114+
androidx.window:window:1.0.0
121115
androidx.work:work-runtime-ktx:2.9.0-rc01
122116
androidx.work:work-runtime:2.9.0-rc01
123117
com.caverock:androidsvg-aar:1.4
124-
com.google.accompanist:accompanist-drawablepainter:0.30.1
118+
com.google.accompanist:accompanist-drawablepainter:0.32.0
125119
com.google.accompanist:accompanist-permissions:0.32.0
126120
com.google.android.datatransport:transport-api:3.0.0
127121
com.google.android.datatransport:transport-backend-cct:3.1.9
@@ -140,10 +134,10 @@ com.google.android.gms:play-services-oss-licenses:17.0.1
140134
com.google.android.gms:play-services-stats:17.0.2
141135
com.google.android.gms:play-services-tasks:18.0.2
142136
com.google.code.findbugs:jsr305:3.0.2
143-
com.google.dagger:dagger-lint-aar:2.48.1
144-
com.google.dagger:dagger:2.48.1
145-
com.google.dagger:hilt-android:2.48.1
146-
com.google.dagger:hilt-core:2.48.1
137+
com.google.dagger:dagger-lint-aar:2.50
138+
com.google.dagger:dagger:2.50
139+
com.google.dagger:hilt-android:2.50
140+
com.google.dagger:hilt-core:2.50
147141
com.google.errorprone:error_prone_annotations:2.11.0
148142
com.google.firebase:firebase-abt:21.1.1
149143
com.google.firebase:firebase-analytics-ktx:21.4.0
@@ -182,27 +176,27 @@ com.squareup.okhttp3:okhttp:4.12.0
182176
com.squareup.okio:okio-jvm:3.6.0
183177
com.squareup.okio:okio:3.6.0
184178
com.squareup.retrofit2:retrofit:2.9.0
185-
io.coil-kt:coil-base:2.4.0
186-
io.coil-kt:coil-compose-base:2.4.0
187-
io.coil-kt:coil-compose:2.4.0
188-
io.coil-kt:coil-svg:2.4.0
189-
io.coil-kt:coil:2.4.0
179+
io.coil-kt:coil-base:2.5.0
180+
io.coil-kt:coil-compose-base:2.5.0
181+
io.coil-kt:coil-compose:2.5.0
182+
io.coil-kt:coil-svg:2.5.0
183+
io.coil-kt:coil:2.5.0
190184
io.github.aakira:napier-android:1.4.1
191185
io.github.aakira:napier:1.4.1
192186
javax.inject:javax.inject:1
193187
org.checkerframework:checker-qual:3.12.0
194-
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10
188+
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.21
195189
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10
196190
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10
197-
org.jetbrains.kotlin:kotlin-stdlib:1.9.10
191+
org.jetbrains.kotlin:kotlin-stdlib:1.9.21
198192
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
199193
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
200194
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
201195
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
202196
org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.7.3
203197
org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3
204-
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.4.1
205-
org.jetbrains.kotlinx:kotlinx-datetime:0.4.1
198+
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.5.0
199+
org.jetbrains.kotlinx:kotlinx-datetime:0.5.0
206200
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0
207201
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.0
208202
org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.0

0 commit comments

Comments
 (0)