Skip to content

Commit 70ab46a

Browse files
committed
Update dependencies
1 parent 6cb733e commit 70ab46a

13 files changed

+51
-49
lines changed

app/build.gradle.kts

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ plugins {
1010
alias(libs.plugins.dagger.hilt)
1111
alias(libs.plugins.wire)
1212
alias(libs.plugins.android.junit5)
13+
alias(libs.plugins.android.junit5.robolectric)
1314
alias(libs.plugins.google.services)
1415
alias(libs.plugins.firebase.crashlytics)
1516
alias(libs.plugins.roborazzi)
@@ -220,16 +221,18 @@ dependencies {
220221
testImplementation(libs.coroutine.test)
221222
androidTestImplementation(libs.coroutine.test)
222223

224+
testImplementation(platform(libs.junit.junit5.bom))
223225
testImplementation(libs.junit.jupiter.api)
224226
testRuntimeOnly(libs.junit.jupiter.engine)
225227
testImplementation(libs.junit.jupiter.params)
226228
testImplementation(libs.junit.junit4)
227229
testRuntimeOnly(libs.junit.jupiter.vintageEngine)
230+
androidTestImplementation(platform(libs.junit.junit5.bom))
228231
androidTestImplementation(libs.androidJunit5.compose)
229232
androidTestImplementation(libs.junit.jupiter.api)
230-
androidTestRuntimeOnly(libs.androidJunit5.runner)
231233

232234
testImplementation(libs.robolectric)
235+
testImplementation(libs.androidJunit5.compose)
233236
testImplementation(libs.roborazzi)
234237
testImplementation(libs.roborazzi.compose)
235238
testImplementation(libs.roborazzi.junit.rule)

app/src/main/java/dev/aungkyawpaing/ccdroidx/feature/MainActivity.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package dev.aungkyawpaing.ccdroidx.feature
22

33
import android.Manifest
4-
import android.annotation.SuppressLint
54
import android.content.Intent
65
import android.os.Bundle
76
import androidx.activity.compose.setContent
@@ -54,10 +53,9 @@ class MainActivity : AppCompatActivity() {
5453
}
5554
}
5655

57-
@SuppressLint("MissingSuperCall")
58-
override fun onNewIntent(intent: Intent?) {
56+
override fun onNewIntent(intent: Intent) {
5957
super.onNewIntent(intent)
60-
handleIntent(intent ?: return)
58+
handleIntent(intent)
6159
}
6260

6361
private fun handleIntent(intent: Intent) {

data/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@ dependencies {
9292
kspTest(libs.dagger.hilt.compiler)
9393
kspTest(libs.dagger.hilt.android.compiler)
9494

95+
testImplementation(platform(libs.junit.junit5.bom))
9596
testImplementation(libs.junit.jupiter.api)
9697
testRuntimeOnly(libs.junit.jupiter.engine)
9798
testImplementation(libs.junit.jupiter.params)
9899
testImplementation(libs.junit.junit4)
99100
testRuntimeOnly(libs.junit.jupiter.vintageEngine)
101+
androidTestImplementation(platform(libs.junit.junit5.bom))
100102
androidTestImplementation(libs.junit.jupiter.api)
101-
androidTestImplementation(libs.androidJunit5.core)
102-
androidTestRuntimeOnly(libs.androidJunit5.runner)
103103

104104
testImplementation(libs.androidx.test.core)
105105
testImplementation(libs.androidx.test.runner)

gradle/libs.versions.toml

+39-38
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,42 @@
11
[versions]
2-
android-junit5 = "1.4.0"
3-
android-plugin = "8.4.0"
4-
androidx-dataStore = "1.0.0"
5-
androidx-fragment = "1.6.2"
6-
androidx-lifecycle = "2.7.0"
7-
androidx-test = "1.5.0"
8-
androidx-work = "2.9.0"
9-
composeBom = "2024.03.00"
2+
android-junit5 = "1.6.0"
3+
android-plugin = "8.4.2"
4+
androidx-dataStore = "1.1.1"
5+
androidx-fragment = "1.8.4"
6+
androidx-lifecycle = "2.8.6"
7+
androidx-test = "1.6.1"
8+
androidx-work = "2.9.1"
9+
composeBom = "2024.10.00"
1010
compose-destinations = "1.10.2"
11-
compose-wear = "1.3.0"
11+
compose-wear = "1.4.0"
1212
dagger = "2.51"
1313
androidx-hilt = "1.2.0"
14-
desugar-jdk-libs = "2.0.4"
15-
espresso = "3.5.1"
16-
firebase-crashlytics-gradle = "2.9.9"
17-
glance = "1.1.0-rc01"
18-
google-services = "4.4.1"
19-
jupiter = "5.10.0"
20-
kotlin = "2.0.0-RC3"
14+
desugar-jdk-libs = "2.1.2"
15+
espresso = "3.6.1"
16+
firebase-crashlytics-gradle = "3.0.2"
17+
glance = "1.1.1"
18+
google-services = "4.4.2"
19+
junit5 = "5.11.1"
20+
kotlin = "2.0.21"
2121
kotlinx-coroutine = "1.8.1"
2222
mockk = "1.12.3"
2323
moshi = "1.14.0"
24-
okhttp = "5.0.0-alpha.12"
24+
okhttp = "5.0.0-alpha.14"
2525
permission-flow = "1.0.0"
2626
prettytime = "5.0.6.Final"
27-
roborazzi = "1.11.0"
27+
roborazzi = "1.29.0"
2828
room = "2.6.1"
2929
timber = "5.0.1"
3030
wire = "4.5.2"
3131

3232
[libraries]
3333
accompanist = { group = "com.google.accompanist", name = "accompanist-themeadapter-material3", version = "0.30.0" }
34-
androidJunit5-core = { group = "de.mannodermaus.junit5", name = "android-test-core", version.ref = "android-junit5" }
35-
androidJunit5-runner = { group = "de.mannodermaus.junit5", name = "android-test-runner", version.ref = "android-junit5" }
36-
androidJunit5-compose = { group = "de.mannodermaus.junit5", name = "android-test-compose", version = "1.0.0-SNAPSHOT" }
37-
androidx-activity = { module = "androidx.activity:activity-ktx", version = "1.8.2" }
38-
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" }
34+
androidJunit5-compose = { group = "de.mannodermaus.junit5", name = "android-test-compose", version = "1.6.0" }
35+
androidx-activity = { module = "androidx.activity:activity-ktx", version = "1.9.3" }
36+
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
3937
androidx-arch-testing = { module = "androidx.arch.core:core-testing", version = "2.2.0" }
4038
androidx-browser = { module = "androidx.browser:browser", version = "1.8.0" }
41-
androidx-core = { module = "androidx.core:core-ktx", version = "1.12.0" }
39+
androidx-core = { module = "androidx.core:core-ktx", version = "1.13.1" }
4240
androidx-dataStore = { group = "androidx.datastore", name = "datastore", version.ref = "androidx-dataStore" }
4341
androidx-dataStore-preference = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidx-dataStore" }
4442
androidx-fragment = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidx-fragment" }
@@ -57,13 +55,13 @@ androidx-lifecycle-viewModel = { group = "androidx.lifecycle", name = "lifecycle
5755
androidx-test-core = { group = "androidx.test", name = "core-ktx", version.ref = "androidx-test" }
5856
androidx-test-espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
5957
androidx-test-espresso-intents = { group = "androidx.test.espresso", name = "espresso-intents", version.ref = "espresso" }
60-
androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit-ktx", version = "1.1.5" }
61-
androidx-test-ext-truth = { group = "androidx.test.ext", name = "truth", version = "1.5.0" }
58+
androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit-ktx", version = "1.2.1" }
59+
androidx-test-ext-truth = { group = "androidx.test.ext", name = "truth", version = "1.6.0" }
6260
androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidx-test" }
63-
androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.5.2" }
61+
androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.6.2" }
6462
androidx-wear = { group = "androidx.wear", name = "wear", version = "1.3.0" }
6563
androidx-wear-complication-dataSource = { module = "androidx.wear.watchface:watchface-complications-data-source-ktx", version = "1.2.1" }
66-
androidx-wear-playservices = { module = "com.google.android.gms:play-services-wearable", version = "18.1.0" }
64+
androidx-wear-playservices = { module = "com.google.android.gms:play-services-wearable", version = "18.2.0" }
6765
androidx-wear-remoteInteractions = { group = "androidx.wear", name = "wear-remote-interactions", version = "1.0.0" }
6866
androidx-work-gcm = { group = "androidx.work", name = "work-gcm", version.ref = "androidx-work" }
6967
androidx-work-multiProcess = { group = "androidx.work", name = "work-multiprocess", version.ref = "androidx-work" }
@@ -77,7 +75,7 @@ compose-destinations-ksp = { group = "io.github.raamcosta.compose-destinations",
7775
compose-foundation = { module = "androidx.compose.foundation:foundation" }
7876
compose-liveData = { module = "androidx.compose.runtime:runtime-livedata" }
7977
compose-material-icon-extended = { module = "androidx.compose.material:material-icons-extended" }
80-
compose-material3 = { module = "androidx.compose.material3:material3", version = "1.2.1" }
78+
compose-material3 = { module = "androidx.compose.material3:material3", version = "1.3.0" }
8179
compose-ui = { group = "androidx.compose.ui", name = "ui" }
8280
compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4" }
8381
compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
@@ -100,14 +98,15 @@ dagger-hilt-android-testing = { group = "com.google.dagger", name = "hilt-androi
10098
dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "dagger" }
10199
desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar-jdk-libs" }
102100
firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics-ktx" }
103-
firebase-bom = "com.google.firebase:firebase-bom:32.8.0"
101+
firebase-bom = "com.google.firebase:firebase-bom:33.4.0"
104102
firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics-ktx" }
105103
junit-junit4 = { module = "junit:junit", version = "4.13.2" }
106-
junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "jupiter" }
107-
junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "jupiter" }
108-
junit-jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "jupiter" }
109-
junit-jupiter-vintageEngine = { group = "org.junit.vintage", name = "junit-vintage-engine", version.ref = "jupiter" }
110-
material = { module = "com.google.android.material:material", version = "1.11.0" }
104+
junit-junit5-bom = { module = "org.junit:junit-bom", version.ref = "junit5" }
105+
junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api" }
106+
junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine" }
107+
junit-jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params" }
108+
junit-jupiter-vintageEngine = { group = "org.junit.vintage", name = "junit-vintage-engine" }
109+
material = { module = "com.google.android.material:material", version = "1.12.0" }
111110
mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
112111
mockk-agentJvm = { group = "io.mockk", name = "mockk-agent-jvm", version.ref = "mockk" }
113112
mockk-android = { group = "io.mockk", name = "mockk-android", version.ref = "mockk" }
@@ -120,7 +119,7 @@ okhttp-logger = { group = "com.squareup.okhttp3", name = "logging-interceptor",
120119
okhttp-mockWebServer = { group = "com.squareup.okhttp3", name = "mockwebserver", version.ref = "okhttp" }
121120
permissionFlow-android = { group = "dev.shreyaspatil.permission-flow", name = "permission-flow-android", version.ref = "permission-flow" }
122121
prettytime = { module = "org.ocpsoft.prettytime:prettytime", version.ref = "prettytime" }
123-
robolectric = { module = "org.robolectric:robolectric", version = "4.11.1" }
122+
robolectric = { module = "org.robolectric:robolectric", version = "4.13" }
124123
roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" }
125124
roborazzi_compose = { group = "io.github.takahirom.roborazzi", name = "roborazzi-compose", version.ref = "roborazzi" }
126125
roborazzi_junit_rule = { group = "io.github.takahirom.roborazzi", name = "roborazzi-junit-rule", version.ref = "roborazzi" }
@@ -135,17 +134,19 @@ wire = { group = "com.squareup.wire", name = "wire-runtime", version.ref = "wire
135134

136135
[plugins]
137136
android-application = { id = "com.android.application", version.ref = "android-plugin" }
138-
android-junit5 = { id = "de.mannodermaus.android-junit5", version = "1.9.3.0" }
137+
android-junit5 = { id = "de.mannodermaus.android-junit5", version = "1.11.2.0" }
138+
android-junit5-robolectric = { id = "tech.apter.junit5.jupiter.robolectric-extension-gradle-plugin", version = "0.7.0" }
139139
android-library = { id = "com.android.library", version.ref = "android-plugin" }
140140
dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }
141141
firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics-gradle" }
142142
google-services = { id = "com.google.gms.google-services", version.ref = "google-services" }
143143
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
144-
kotlin-ksp = { id = "com.google.devtools.ksp", version = "2.0.0-RC3-1.0.20" }
144+
kotlin-ksp = { id = "com.google.devtools.ksp", version = "2.0.21-1.0.25" }
145145
kotlin-pracelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
146146
kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
147147
roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }
148148
wire = { id = "com.squareup.wire", version.ref = "wire" }
149149

150+
150151
[bundles]
151152

wear/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,14 @@ dependencies {
155155
kspTest(libs.dagger.hilt.compiler)
156156
kspTest(libs.dagger.hilt.android.compiler)
157157

158+
testImplementation(platform(libs.junit.junit5.bom))
158159
testImplementation(libs.junit.jupiter.api)
159160
testRuntimeOnly(libs.junit.jupiter.engine)
160161
testImplementation(libs.junit.jupiter.params)
161162
testImplementation(libs.junit.junit4)
162163
testRuntimeOnly(libs.junit.jupiter.vintageEngine)
164+
androidTestImplementation(platform(libs.junit.junit5.bom))
163165
androidTestImplementation(libs.junit.jupiter.api)
164-
androidTestImplementation(libs.androidJunit5.core)
165-
androidTestRuntimeOnly(libs.androidJunit5.runner)
166166

167167
testImplementation(libs.androidx.test.core)
168168
testImplementation(libs.androidx.test.runner)

weardatalayer/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ dependencies {
6161

6262
implementation(libs.androidx.wear.playservices)
6363

64+
testImplementation(platform(libs.junit.junit5.bom))
6465
testImplementation(libs.junit.jupiter.api)
6566
testRuntimeOnly(libs.junit.jupiter.engine)
6667
testImplementation(libs.junit.jupiter.params)
6768
testImplementation(libs.junit.junit4)
6869
testRuntimeOnly(libs.junit.jupiter.vintageEngine)
70+
androidTestImplementation(platform(libs.junit.junit5.bom))
6971
androidTestImplementation(libs.junit.jupiter.api)
70-
androidTestImplementation(libs.androidJunit5.core)
71-
androidTestRuntimeOnly(libs.androidJunit5.runner)
7272
}

0 commit comments

Comments
 (0)