Merge pull request #49 from joreilly/dependency_updates

dependency updates
joreilly · May 21, 2024 · d601e89 · d601e89
2 parents 6881548 + 50d45f5
commit d601e89
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 35 deletions.
diff --git a/android-app/build.gradle.kts b/android-app/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.android.application)
     kotlin("android")
     alias(libs.plugins.googleServices)
+    alias(libs.plugins.compose.compiler)
 }
 
 
@@ -78,11 +79,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
-    }
-
-
     buildTypes {
         getByName("release") {
             isShrinkResources = true
@@ -144,7 +140,7 @@ dependencies {
 
     // TODO: Added this as a temporary fix for a crash in ProgressIndicator, can be removed later.
     // Issue: https://github.com/JetBrains/compose-multiplatform/issues/4157
-    implementation("androidx.compose.material3:material3-android:1.2.0-beta02")
+    implementation("androidx.compose.material3:material3-android:1.2.1")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.1")
     implementation("com.google.maps.android:android-maps-utils:2.3.0")
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,57 +1,57 @@
 [versions]
-composeUiTooling = "1.3.0"
-kotlin = "1.9.22"
-ksp = "1.9.22-1.0.17"
-coroutines = "1.8.0"
+composeUiTooling = "1.3.1"
+kotlin = "2.0.0-RC3"
+ksp = "2.0.0-RC3-1.0.20"
+coroutines = "1.8.1"
 kotlinxSerialization = "1.6.3"
-kotlinxDateTime = "0.6.0-RC"
-androidGradlePlugin = "8.2.2"
-koin = "3.5.3"
-koinCompose = "3.5.3"
-ktor = "2.3.8"
-slf4j = "2.0.9"
-sqlDelight = "2.0.1"
-kmpNativeCoroutines = "1.0.0-ALPHA-23"
+kotlinxDateTime = "0.6.0-RC.2"
+androidGradlePlugin = "8.4.0"
+koin = "3.6.0-Beta4"
+koinCompose = "3.6.0-Beta4"
+koinComposeMultiplatform = "1.2.0-Beta4"
+ktor = "2.3.11"
+slf4j = "2.0.12"
+sqlDelight = "2.0.2"
+kmpNativeCoroutines = "1.0.0-ALPHA-30-kotlin-2.0.0-RC3"
 googleServices = "4.3.15"
 
-androidxActivity = "1.8.2"
+androidxActivity = "1.9.0"
 androidxComposeCompiler = "1.5.8"
 jbComposeCompiler = "1.5.4"
-androidxComposeBom = "2024.02.01"
+androidxComposeBom = "2024.05.00"
 androidxNavigationCompose = "2.7.7"
 uiToolingPreview = "1.6.2"
-wearCompose = "1.3.0"
-androidxLifecycle = "2.7.0"
-imageLoader = "1.7.6"
+wearCompose = "1.3.1"
+androidxLifecycle = "2.8.0"
+imageLoader = "1.7.8"
 osmdroidAndroid = "6.1.18"
 
 composeMultiplatform = "1.6.0"
 accompanist = "0.32.0"
 coilCompose = "2.6.0"
-horologist = "0.6.3"
-okhttp = "5.0.0-alpha.12"
+horologist = "0.6.10"
+okhttp = "5.0.0-alpha.14"
 
 junit = "4.13.2"
 androidxTestJUnit = "1.1.5"
-robolectric = "4.11.1"
+robolectric = "4.12.1"
 androidxTestCore = "1.5.0"
 mockito = "3.11.2"
 
 multiplatformSettings = "1.1.1"
-kermit = "2.0.2"
+kermit = "2.0.3"
 
 minSdk = "24"
 minWearSdk = "26"
 targetSdk = "34"
 targetWearSdk = "33"
 compileSdk = "34"
-kotlinVersion = "1.9.22"
-coreKtx = "1.12.0"
+coreKtx = "1.13.1"
 espressoCore = "3.5.1"
 appcompat = "1.6.1"
-material = "1.11.0"
+material = "1.12.0"
 constraintlayout = "2.1.4"
-lifecycleLivedataKtx = "2.7.0"
+lifecycleLivedataKtx = "2.8.0"
 navigationFragmentKtx = "2.7.7"
 navigationUiKtx = "2.7.7"
 
@@ -75,8 +75,8 @@ androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime
 androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
 androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
-androidx-compose-material3 =  { group = "androidx.compose.material3", name = "material3" }
-androidx-compose-material3-WindowSizeClass =  { group = "androidx.compose.material3", name="material3-window-size-class" }
+androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
+androidx-compose-material3-WindowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigationCompose" }
 androidx-lifecycle-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidxLifecycle" }
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidxLifecycle" }
@@ -167,5 +167,7 @@ kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref =
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kmpNativeCoroutines = { id = "com.rickclephas.kmp.nativecoroutines", version.ref = "kmpNativeCoroutines" }
 sqlDelight = { id = "app.cash.sqldelight", version.ref = "sqlDelight" }
-jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinVersion" }
+jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 googleServices = { id = "com.google.gms.google-services", version.ref = "googleServices" }
+jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun May 28 21:12:18 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists