From e2a719164f59fa93da48f761f2d722b28da68c2e Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Thu, 30 May 2024 09:48:45 -0400 Subject: [PATCH] Migrates Kotlin and dependencies to the latest version --- .idea/kotlinc.xml | 2 +- app/build.gradle | 2 +- commons/build.gradle | 2 +- gradle/libs.versions.toml | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index fe63bb677..148fdd246 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 8f1ca7d69..d4b1f7955 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -143,7 +143,7 @@ android { composeOptions { // Should match compose version : https://developer.android.com/jetpack/androidx/releases/compose-kotlin - kotlinCompilerExtensionVersion "1.5.11" + kotlinCompilerExtensionVersion "1.5.14" } packagingOptions { resources { diff --git a/commons/build.gradle b/commons/build.gradle index c139a70c8..21921a446 100644 --- a/commons/build.gradle +++ b/commons/build.gradle @@ -38,7 +38,7 @@ android { } composeOptions { // Should match compose version : https://developer.android.com/jetpack/androidx/releases/compose-kotlin - kotlinCompilerExtensionVersion "1.5.11" + kotlinCompilerExtensionVersion "1.5.14" } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 44f70139a..ce18deaad 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,11 +3,10 @@ accompanistAdaptive = "0.34.0" activityCompose = "1.9.0" agp = "8.4.1" androidKotlinGeohash = "1.0" -androidLifecycle = "2.7.0" androidxJunit = "1.2.0-beta01" -appcompat = "1.6.1" +appcompat = "1.7.0" audiowaveform = "1.1.1" -benchmark = "1.2.3" +benchmark = "1.2.4" benchmarkJunit4 = "1.2.4" biometricKtx = "1.2.0-alpha05" blurhash = "1.0.0" @@ -21,10 +20,11 @@ gms = "4.4.1" jacksonModuleKotlin = "2.17.1" jna = "5.14.0" junit = "4.13.2" -kotlin = "1.9.23" +kotlin = "1.9.24" kotlinxCollectionsImmutable = "0.3.7" languageId = "17.0.5" lazysodiumAndroid = "5.1.0" +lifecycleRuntimeKtx = "2.7.0" lightcompressor = "1.3.2" markdown = "077a2cde64" media3 = "1.3.1" @@ -59,10 +59,10 @@ androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", ve androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" } androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidxJunit" } androidx-junit-ktx = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "androidxJunit" } -androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidLifecycle" } -androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidLifecycle" } -androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidLifecycle" } -androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidLifecycle" } +androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycleRuntimeKtx" } +androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntimeKtx" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } +androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleRuntimeKtx" } androidx-material-icons = { group = "androidx.compose.material", name = "material-icons-extended" } androidx-material3 = { group = "androidx.compose.material3", name = "material3" } androidx-material3-windowSize = { group = "androidx.compose.material3", name = "material3-window-size-class" }