Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
vincent-paing committed Oct 21, 2024
1 parent 6cb733e commit 70ab46a
Show file tree
Hide file tree
Showing 13 changed files with 51 additions and 49 deletions.
5 changes: 4 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ plugins {
alias(libs.plugins.dagger.hilt)
alias(libs.plugins.wire)
alias(libs.plugins.android.junit5)
alias(libs.plugins.android.junit5.robolectric)
alias(libs.plugins.google.services)
alias(libs.plugins.firebase.crashlytics)
alias(libs.plugins.roborazzi)
Expand Down Expand Up @@ -220,16 +221,18 @@ dependencies {
testImplementation(libs.coroutine.test)
androidTestImplementation(libs.coroutine.test)

testImplementation(platform(libs.junit.junit5.bom))
testImplementation(libs.junit.jupiter.api)
testRuntimeOnly(libs.junit.jupiter.engine)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.junit.junit4)
testRuntimeOnly(libs.junit.jupiter.vintageEngine)
androidTestImplementation(platform(libs.junit.junit5.bom))
androidTestImplementation(libs.androidJunit5.compose)
androidTestImplementation(libs.junit.jupiter.api)
androidTestRuntimeOnly(libs.androidJunit5.runner)

testImplementation(libs.robolectric)
testImplementation(libs.androidJunit5.compose)
testImplementation(libs.roborazzi)
testImplementation(libs.roborazzi.compose)
testImplementation(libs.roborazzi.junit.rule)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package dev.aungkyawpaing.ccdroidx.feature

import android.Manifest
import android.annotation.SuppressLint
import android.content.Intent
import android.os.Bundle
import androidx.activity.compose.setContent
Expand Down Expand Up @@ -54,10 +53,9 @@ class MainActivity : AppCompatActivity() {
}
}

@SuppressLint("MissingSuperCall")
override fun onNewIntent(intent: Intent?) {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
handleIntent(intent ?: return)
handleIntent(intent)
}

private fun handleIntent(intent: Intent) {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ dependencies {
kspTest(libs.dagger.hilt.compiler)
kspTest(libs.dagger.hilt.android.compiler)

testImplementation(platform(libs.junit.junit5.bom))
testImplementation(libs.junit.jupiter.api)
testRuntimeOnly(libs.junit.jupiter.engine)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.junit.junit4)
testRuntimeOnly(libs.junit.jupiter.vintageEngine)
androidTestImplementation(platform(libs.junit.junit5.bom))
androidTestImplementation(libs.junit.jupiter.api)
androidTestImplementation(libs.androidJunit5.core)
androidTestRuntimeOnly(libs.androidJunit5.runner)

testImplementation(libs.androidx.test.core)
testImplementation(libs.androidx.test.runner)
Expand Down
77 changes: 39 additions & 38 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,44 +1,42 @@
[versions]
android-junit5 = "1.4.0"
android-plugin = "8.4.0"
androidx-dataStore = "1.0.0"
androidx-fragment = "1.6.2"
androidx-lifecycle = "2.7.0"
androidx-test = "1.5.0"
androidx-work = "2.9.0"
composeBom = "2024.03.00"
android-junit5 = "1.6.0"
android-plugin = "8.4.2"
androidx-dataStore = "1.1.1"
androidx-fragment = "1.8.4"
androidx-lifecycle = "2.8.6"
androidx-test = "1.6.1"
androidx-work = "2.9.1"
composeBom = "2024.10.00"
compose-destinations = "1.10.2"
compose-wear = "1.3.0"
compose-wear = "1.4.0"
dagger = "2.51"
androidx-hilt = "1.2.0"
desugar-jdk-libs = "2.0.4"
espresso = "3.5.1"
firebase-crashlytics-gradle = "2.9.9"
glance = "1.1.0-rc01"
google-services = "4.4.1"
jupiter = "5.10.0"
kotlin = "2.0.0-RC3"
desugar-jdk-libs = "2.1.2"
espresso = "3.6.1"
firebase-crashlytics-gradle = "3.0.2"
glance = "1.1.1"
google-services = "4.4.2"
junit5 = "5.11.1"
kotlin = "2.0.21"
kotlinx-coroutine = "1.8.1"
mockk = "1.12.3"
moshi = "1.14.0"
okhttp = "5.0.0-alpha.12"
okhttp = "5.0.0-alpha.14"
permission-flow = "1.0.0"
prettytime = "5.0.6.Final"
roborazzi = "1.11.0"
roborazzi = "1.29.0"
room = "2.6.1"
timber = "5.0.1"
wire = "4.5.2"

[libraries]
accompanist = { group = "com.google.accompanist", name = "accompanist-themeadapter-material3", version = "0.30.0" }
androidJunit5-core = { group = "de.mannodermaus.junit5", name = "android-test-core", version.ref = "android-junit5" }
androidJunit5-runner = { group = "de.mannodermaus.junit5", name = "android-test-runner", version.ref = "android-junit5" }
androidJunit5-compose = { group = "de.mannodermaus.junit5", name = "android-test-compose", version = "1.0.0-SNAPSHOT" }
androidx-activity = { module = "androidx.activity:activity-ktx", version = "1.8.2" }
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" }
androidJunit5-compose = { group = "de.mannodermaus.junit5", name = "android-test-compose", version = "1.6.0" }
androidx-activity = { module = "androidx.activity:activity-ktx", version = "1.9.3" }
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
androidx-arch-testing = { module = "androidx.arch.core:core-testing", version = "2.2.0" }
androidx-browser = { module = "androidx.browser:browser", version = "1.8.0" }
androidx-core = { module = "androidx.core:core-ktx", version = "1.12.0" }
androidx-core = { module = "androidx.core:core-ktx", version = "1.13.1" }
androidx-dataStore = { group = "androidx.datastore", name = "datastore", version.ref = "androidx-dataStore" }
androidx-dataStore-preference = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidx-dataStore" }
androidx-fragment = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidx-fragment" }
Expand All @@ -57,13 +55,13 @@ androidx-lifecycle-viewModel = { group = "androidx.lifecycle", name = "lifecycle
androidx-test-core = { group = "androidx.test", name = "core-ktx", version.ref = "androidx-test" }
androidx-test-espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
androidx-test-espresso-intents = { group = "androidx.test.espresso", name = "espresso-intents", version.ref = "espresso" }
androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit-ktx", version = "1.1.5" }
androidx-test-ext-truth = { group = "androidx.test.ext", name = "truth", version = "1.5.0" }
androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit-ktx", version = "1.2.1" }
androidx-test-ext-truth = { group = "androidx.test.ext", name = "truth", version = "1.6.0" }
androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidx-test" }
androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.5.2" }
androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.6.2" }
androidx-wear = { group = "androidx.wear", name = "wear", version = "1.3.0" }
androidx-wear-complication-dataSource = { module = "androidx.wear.watchface:watchface-complications-data-source-ktx", version = "1.2.1" }
androidx-wear-playservices = { module = "com.google.android.gms:play-services-wearable", version = "18.1.0" }
androidx-wear-playservices = { module = "com.google.android.gms:play-services-wearable", version = "18.2.0" }
androidx-wear-remoteInteractions = { group = "androidx.wear", name = "wear-remote-interactions", version = "1.0.0" }
androidx-work-gcm = { group = "androidx.work", name = "work-gcm", version.ref = "androidx-work" }
androidx-work-multiProcess = { group = "androidx.work", name = "work-multiprocess", version.ref = "androidx-work" }
Expand All @@ -77,7 +75,7 @@ compose-destinations-ksp = { group = "io.github.raamcosta.compose-destinations",
compose-foundation = { module = "androidx.compose.foundation:foundation" }
compose-liveData = { module = "androidx.compose.runtime:runtime-livedata" }
compose-material-icon-extended = { module = "androidx.compose.material:material-icons-extended" }
compose-material3 = { module = "androidx.compose.material3:material3", version = "1.2.1" }
compose-material3 = { module = "androidx.compose.material3:material3", version = "1.3.0" }
compose-ui = { group = "androidx.compose.ui", name = "ui" }
compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4" }
compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
Expand All @@ -100,14 +98,15 @@ dagger-hilt-android-testing = { group = "com.google.dagger", name = "hilt-androi
dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "dagger" }
desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar-jdk-libs" }
firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics-ktx" }
firebase-bom = "com.google.firebase:firebase-bom:32.8.0"
firebase-bom = "com.google.firebase:firebase-bom:33.4.0"
firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics-ktx" }
junit-junit4 = { module = "junit:junit", version = "4.13.2" }
junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "jupiter" }
junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "jupiter" }
junit-jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "jupiter" }
junit-jupiter-vintageEngine = { group = "org.junit.vintage", name = "junit-vintage-engine", version.ref = "jupiter" }
material = { module = "com.google.android.material:material", version = "1.11.0" }
junit-junit5-bom = { module = "org.junit:junit-bom", version.ref = "junit5" }
junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api" }
junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine" }
junit-jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params" }
junit-jupiter-vintageEngine = { group = "org.junit.vintage", name = "junit-vintage-engine" }
material = { module = "com.google.android.material:material", version = "1.12.0" }
mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
mockk-agentJvm = { group = "io.mockk", name = "mockk-agent-jvm", version.ref = "mockk" }
mockk-android = { group = "io.mockk", name = "mockk-android", version.ref = "mockk" }
Expand All @@ -120,7 +119,7 @@ okhttp-logger = { group = "com.squareup.okhttp3", name = "logging-interceptor",
okhttp-mockWebServer = { group = "com.squareup.okhttp3", name = "mockwebserver", version.ref = "okhttp" }
permissionFlow-android = { group = "dev.shreyaspatil.permission-flow", name = "permission-flow-android", version.ref = "permission-flow" }
prettytime = { module = "org.ocpsoft.prettytime:prettytime", version.ref = "prettytime" }
robolectric = { module = "org.robolectric:robolectric", version = "4.11.1" }
robolectric = { module = "org.robolectric:robolectric", version = "4.13" }
roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" }
roborazzi_compose = { group = "io.github.takahirom.roborazzi", name = "roborazzi-compose", version.ref = "roborazzi" }
roborazzi_junit_rule = { group = "io.github.takahirom.roborazzi", name = "roborazzi-junit-rule", version.ref = "roborazzi" }
Expand All @@ -135,17 +134,19 @@ wire = { group = "com.squareup.wire", name = "wire-runtime", version.ref = "wire

[plugins]
android-application = { id = "com.android.application", version.ref = "android-plugin" }
android-junit5 = { id = "de.mannodermaus.android-junit5", version = "1.9.3.0" }
android-junit5 = { id = "de.mannodermaus.android-junit5", version = "1.11.2.0" }
android-junit5-robolectric = { id = "tech.apter.junit5.jupiter.robolectric-extension-gradle-plugin", version = "0.7.0" }
android-library = { id = "com.android.library", version.ref = "android-plugin" }
dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }
firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics-gradle" }
google-services = { id = "com.google.gms.google-services", version.ref = "google-services" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-ksp = { id = "com.google.devtools.ksp", version = "2.0.0-RC3-1.0.20" }
kotlin-ksp = { id = "com.google.devtools.ksp", version = "2.0.21-1.0.25" }
kotlin-pracelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }
wire = { id = "com.squareup.wire", version.ref = "wire" }


[bundles]

4 changes: 2 additions & 2 deletions wear/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,14 @@ dependencies {
kspTest(libs.dagger.hilt.compiler)
kspTest(libs.dagger.hilt.android.compiler)

testImplementation(platform(libs.junit.junit5.bom))
testImplementation(libs.junit.jupiter.api)
testRuntimeOnly(libs.junit.jupiter.engine)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.junit.junit4)
testRuntimeOnly(libs.junit.jupiter.vintageEngine)
androidTestImplementation(platform(libs.junit.junit5.bom))
androidTestImplementation(libs.junit.jupiter.api)
androidTestImplementation(libs.androidJunit5.core)
androidTestRuntimeOnly(libs.androidJunit5.runner)

testImplementation(libs.androidx.test.core)
testImplementation(libs.androidx.test.runner)
Expand Down
4 changes: 2 additions & 2 deletions weardatalayer/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ dependencies {

implementation(libs.androidx.wear.playservices)

testImplementation(platform(libs.junit.junit5.bom))
testImplementation(libs.junit.jupiter.api)
testRuntimeOnly(libs.junit.jupiter.engine)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.junit.junit4)
testRuntimeOnly(libs.junit.jupiter.vintageEngine)
androidTestImplementation(platform(libs.junit.junit5.bom))
androidTestImplementation(libs.junit.jupiter.api)
androidTestImplementation(libs.androidJunit5.core)
androidTestRuntimeOnly(libs.androidJunit5.runner)
}

0 comments on commit 70ab46a

Please sign in to comment.