From 40340304738706cedafdd452c8978b960baa48e9 Mon Sep 17 00:00:00 2001 From: Domenico Date: Mon, 10 Jun 2024 18:04:09 +0200 Subject: [PATCH 1/4] Done #1969 --- gradle/libs-urbi.versions.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle/libs-urbi.versions.toml b/gradle/libs-urbi.versions.toml index 1aa57c6c4..847696fb0 100644 --- a/gradle/libs-urbi.versions.toml +++ b/gradle/libs-urbi.versions.toml @@ -2,14 +2,14 @@ accompanist_compose = "0.34.0" adapter-delegates4 = "4.3.0" adjust = "4.33.5" -android-gradle-plugin = "8.3.2" +android-gradle-plugin = "8.4.1" android-installreferrer = "2.2" android-material = "1.11.0" android-places = "3.4.0" androidx-activity = "1.8.1" androidx-camera = "1.3.0" androidx-camera-view = "1.3.0" -androidx-compose-bom = "2024.04.01" +androidx-compose-bom = "2024.05.00" androidx-fragment = "1.6.2" androidx-appcompat = "1.6.1" androidx-biometric = "1.1.0" @@ -37,7 +37,7 @@ androidx-web-kit = "1.8.0" apache-commons-lang = "3.5" commons-codec = "1.15" dagger = "2.51.1" -firebase-bom = "32.8.1" +firebase-bom = "33.1.0" firebase-app-distribution-plugin = "3.1.0" firebase-crashlytics-plugin = "2.9.9" firebase-ui-auth = "8.0.2" @@ -45,7 +45,7 @@ flow-layout = "1.3.3" glide = "4.16.0" glide-compose = "1.0.0-alpha.5" gson = "2.10.1" -google-maps-compose = "4.3.3" +google-maps-compose = "5.0.3" google-maps-secrets = "2.0.1" google-maps-utils = "3.8.2" google-mlkit-barcode-scanning = "17.0.2" @@ -67,12 +67,11 @@ jmrtd = "0.7.18" jnbis = "1.1.0" junit = "4.13.2" jwt = "0.8.0" -kotlin = "1.9.23" -kotlin-compiler-extension = "1.5.12" +kotlin = "2.0.0" kotlinx-coroutines = "1.8.0" kotlinter = "3.1.0" kustomer = "2.10.8" -ksp-plugin = "1.9.23-1.0.20" +ksp-plugin = "2.0.0-1.0.22" landscapist-glide = "1.5.2" lottie = "6.1.0" material-datetime-picker = "4.2.3" @@ -337,3 +336,4 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } kotlinter = { id = "org.jmailen.kotlinter", version.ref = "kotlinter" } triplet-play = { id = "com.github.triplet.play", version.ref = "triplet-play" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } \ No newline at end of file From b914635dd15047c652b9a301bdfd81dba0faa652 Mon Sep 17 00:00:00 2001 From: Domenico Date: Tue, 11 Jun 2024 10:13:20 +0200 Subject: [PATCH 2/4] Update Kotlin 2.0 --- gradle/libs-urbi.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs-urbi.versions.toml b/gradle/libs-urbi.versions.toml index 847696fb0..cff9911cd 100644 --- a/gradle/libs-urbi.versions.toml +++ b/gradle/libs-urbi.versions.toml @@ -69,7 +69,7 @@ junit = "4.13.2" jwt = "0.8.0" kotlin = "2.0.0" kotlinx-coroutines = "1.8.0" -kotlinter = "3.1.0" +kotlinter = "4.3.0" kustomer = "2.10.8" ksp-plugin = "2.0.0-1.0.22" landscapist-glide = "1.5.2" From 10222da40fcf513614bdecdf62cde78156a5eef2 Mon Sep 17 00:00:00 2001 From: Domenico Date: Tue, 11 Jun 2024 10:50:12 +0200 Subject: [PATCH 3/4] Update Kotlin 2.0 --- gradle/ktlint_set.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/gradle/ktlint_set.gradle b/gradle/ktlint_set.gradle index ef3b78ac8..ccc9137e9 100644 --- a/gradle/ktlint_set.gradle +++ b/gradle/ktlint_set.gradle @@ -1,6 +1,4 @@ kotlinter { ignoreFailures = false reporters = ['checkstyle', 'plain','html'] - experimentalRules = false - disabledRules = ['no-wildcard-imports','no-consecutive-blank-lines'] } \ No newline at end of file From 41f71f773e06c4072d72898f4111705bb623c147 Mon Sep 17 00:00:00 2001 From: Domenico Date: Tue, 11 Jun 2024 17:27:10 +0200 Subject: [PATCH 4/4] Update Firebase and Kotlin #1969 --- gradle/libs-urbi.versions.toml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gradle/libs-urbi.versions.toml b/gradle/libs-urbi.versions.toml index cff9911cd..00e193f24 100644 --- a/gradle/libs-urbi.versions.toml +++ b/gradle/libs-urbi.versions.toml @@ -2,27 +2,27 @@ accompanist_compose = "0.34.0" adapter-delegates4 = "4.3.0" adjust = "4.33.5" -android-gradle-plugin = "8.4.1" +android-gradle-plugin = "8.4.2" android-installreferrer = "2.2" android-material = "1.11.0" -android-places = "3.4.0" -androidx-activity = "1.8.1" +android-places = "3.5.0" +androidx-activity = "1.9.0" androidx-camera = "1.3.0" androidx-camera-view = "1.3.0" androidx-compose-bom = "2024.05.00" -androidx-fragment = "1.6.2" -androidx-appcompat = "1.6.1" +androidx-fragment = "1.7.1" +androidx-appcompat = "1.7.0" androidx-biometric = "1.1.0" androidx-biometric-ktx = "1.2.0-alpha05" androidx-constraintlayout = "2.1.4" androidx-constraintlayout-compose = "1.1.0-alpha13" -androidx-core-ktx = "1.12.0" +androidx-core-ktx = "1.13.1" androidx-core-testing = "2.2.0" androidx-gridlayout = "1.0.0" androidx-hilt-navigation-compose = "1.2.0" androidx-legacy-support = "1.0.0" -androidx-lifecycle = "2.6.2" -androidx-navigation = "2.7.1" +androidx-lifecycle = "2.8.1" +androidx-navigation = "2.7.7" androidx-preference = "1.1.0" androidx-security-crypto = "1.1.0-alpha06" androidx-splashscreen = "1.0.1" @@ -39,7 +39,7 @@ commons-codec = "1.15" dagger = "2.51.1" firebase-bom = "33.1.0" firebase-app-distribution-plugin = "3.1.0" -firebase-crashlytics-plugin = "2.9.9" +firebase-crashlytics-plugin = "3.0.1" firebase-ui-auth = "8.0.2" flow-layout = "1.3.3" glide = "4.16.0" @@ -51,15 +51,15 @@ google-maps-utils = "3.8.2" google-mlkit-barcode-scanning = "17.0.2" google-play-services-ads = "18.0.1" google-play-services-appset = "16.0.2" -google-play-services-authphone = "18.0.2" -google-play-services-base = "18.4.0" +google-play-services-authphone = "18.1.0" +google-play-services-base = "18.5.0" google-play-services-maps = "18.2.0" -google-play-services-location = "21.2.0" +google-play-services-location = "21.3.0" google-play-services-mlkit-face-detection = "17.1.0" google-play-services-mlkit-text-recognition = "19.0.0" -google-play-services-pay = "16.4.0" -google-play-services-plugin = "4.3.14" -google-play-services-wallet = "19.2.1" +google-play-services-pay = "16.5.0" +google-play-services-plugin = "4.4.2" +google-play-services-wallet = "19.4.0" instabug = "12.2.0" jj2000 = "5.2" json-test = "20180813" @@ -68,7 +68,7 @@ jnbis = "1.1.0" junit = "4.13.2" jwt = "0.8.0" kotlin = "2.0.0" -kotlinx-coroutines = "1.8.0" +kotlinx-coroutines = "1.8.1" kotlinter = "4.3.0" kustomer = "2.10.8" ksp-plugin = "2.0.0-1.0.22" @@ -91,7 +91,7 @@ scuba = "0.0.20" shared-preferences-mock = "1.2.4" spongycastle = "1.58.0.0" sql-cipher = "4.4.3" -stripe-android = "20.9.0" +stripe-android = "20.39.0" subsampling-scale-image = "3.10.0" tempo = "1.3.0-alpha01" triplet-play = "3.8.1"