From 58d83a3956134cb59fe69bd47cafbc5c0403f4dc Mon Sep 17 00:00:00 2001
From: John O'Reilly <oreillyj@gmail.com>
Date: Sun, 3 Mar 2024 12:23:25 +0000
Subject: [PATCH] dependency updates

---
 common/build.gradle.kts          |  7 +------
 compose-desktop/build.gradle.kts |  5 -----
 gradle/libs.versions.toml        | 30 ++++++++++++++++--------------
 settings.gradle.kts              | 16 ++--------------
 4 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 0076c9fb..5da2b9bb 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -65,7 +65,7 @@ kotlin {
             implementation(compose.material3)
             implementation(compose.components.resources)
 
-            implementation("io.github.koalaplot:koalaplot-core:0.5.1")
+            implementation(libs.koalaplot.core)
             implementation(libs.image.loader)
         }
 
@@ -92,8 +92,3 @@ kotlin {
 kotlin.sourceSets.all {
     languageSettings.optIn("kotlin.experimental.ExperimentalObjCName")
 }
-
-compose {
-    kotlinCompilerPlugin.set(libs.versions.jbComposeCompiler.get())
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.20")
-}
\ No newline at end of file
diff --git a/compose-desktop/build.gradle.kts b/compose-desktop/build.gradle.kts
index 8916f090..1ba859e5 100644
--- a/compose-desktop/build.gradle.kts
+++ b/compose-desktop/build.gradle.kts
@@ -18,8 +18,3 @@ dependencies {
 application {
     mainClass.set("MainKt")
 }
-
-compose {
-    kotlinCompilerPlugin.set(libs.versions.jbComposeCompiler)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.21")
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6dd033a8..d0d68d3b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,28 +1,29 @@
 [versions]
-kotlin = "1.9.21"
-ksp = "1.9.21-1.0.16"
-coroutines = "1.8.0-RC2"
-kotlinxSerialization = "1.6.2"
+kotlin = "1.9.22"
+ksp = "1.9.22-1.0.17"
+coroutines = "1.8.0"
+kotlinxSerialization = "1.6.3"
 kotlinxDateTime = "0.5.0"
-androidGradlePlugin = "8.2.0"
+androidGradlePlugin = "8.2.2"
+koalaplot = "0.5.1"
 koin = "3.5.3"
 koinCompose = "3.5.3"
-ktor = "2.3.7"
+ktor = "2.3.8"
 slf4j = "2.0.9"
 realm = "1.13.0"
 skie = "0.6.1"
 
 androidxActivity = "1.8.2"
-androidxComposeCompiler = "1.5.5-dev-k1.9.21-163bb051fe5"
-jbComposeCompiler = "1.5.4"
-androidxComposeBom = "2023.10.01"
-androidxNavigationCompose = "2.7.6"
-androidxLifecycle = "2.6.2"
+androidxComposeCompiler = "1.5.8"
+jbComposeCompiler = "1.5.8"
+androidxComposeBom = "2024.02.01"
+androidxNavigationCompose = "2.7.7"
+androidxLifecycle = "2.7.0"
 
-composeMultiplatform = "1.5.11"
+composeMultiplatform = "1.6.0"
 accompanist = "0.32.0"
-coilCompose = "2.5.0"
-image-loader = "1.7.1"
+coilCompose = "2.6.0"
+image-loader = "1.7.7"
 
 junit = "4.13.2"
 
@@ -61,6 +62,7 @@ androidx-lifecycle-compose = { module = "androidx.lifecycle:lifecycle-runtime-co
 coilCompose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coilCompose" }
 accompanist-placeholder = { group = "com.google.accompanist", name = "accompanist-placeholder-material3", version.ref = "accompanist" }
 image-loader = { module = "io.github.qdsfdhvh:image-loader", version.ref = "image-loader" }
+koalaplot-core = { module = "io.github.koalaplot:koalaplot-core", version.ref = "koalaplot" }
 
 koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
 koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koinCompose" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d602ff41..bbe50f00 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,12 +1,6 @@
 pluginManagement {
     repositories {
-        google {
-            mavenContent {
-                includeGroupByRegex(".*google.*")
-                includeGroupByRegex(".*android.*")
-            }
-        }
-
+        google()
         mavenCentral()
         gradlePluginPortal()
     }
@@ -14,13 +8,7 @@ pluginManagement {
 
 dependencyResolutionManagement {
     repositories {
-        google {
-            mavenContent {
-                includeGroupByRegex(".*google.*")
-                includeGroupByRegex(".*android.*")
-            }
-        }
-
+        google()
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")