From d6c1f6e80411db023f2a19ba740e9fb3d512f00e Mon Sep 17 00:00:00 2001
From: John O'Reilly <oreillyj@gmail.com>
Date: Sat, 2 Dec 2023 10:00:21 +0000
Subject: [PATCH] dependency updates

---
 backend/build.gradle.kts               | 10 +++++-----
 buildSrc/src/main/java/Dependencies.kt | 12 ++++--------
 compose-desktop/build.gradle.kts       |  4 ++++
 compose-web-wasm/build.gradle.kts      |  4 ++--
 compose-web/build.gradle.kts           |  2 +-
 gradle.properties                      |  2 +-
 gradle/libs.versions.toml              | 10 +++++-----
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
index 474e71f4..6aa79e35 100644
--- a/backend/build.gradle.kts
+++ b/backend/build.gradle.kts
@@ -16,11 +16,11 @@ kotlin {
             implementation(libs.kotlinx.coroutines)
             implementation(libs.kotlinx.serialization)
 
-            implementation("io.ktor:ktor-server-core:2.3.5")
-            implementation("io.ktor:ktor-server-netty:2.3.5")
-            implementation("io.ktor:ktor-server-cors:2.3.5")
-            implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.5")
-            implementation("io.ktor:ktor-server-content-negotiation:2.3.5")
+            implementation("io.ktor:ktor-server-core:2.3.6")
+            implementation("io.ktor:ktor-server-netty:2.3.6")
+            implementation("io.ktor:ktor-server-cors:2.3.6")
+            implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.6")
+            implementation("io.ktor:ktor-server-content-negotiation:2.3.6")
 
             implementation("ch.qos.logback:logback-classic:1.2.3")
 
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index c8e793a3..f7365f8f 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -2,14 +2,10 @@
 
 object Versions {
     const val androidXTestJUnit = "1.1.5"
-    const val testCore = "1.3.0"
+    const val testCore = "1.5.0"
     const val mockito = "3.11.2"
     const val robolectric = "4.10"
 
-//    const val lifecycleKtx = "2.6.1"
-//    const val lifecycleRuntimeKtx = lifecycleKtx
-//    const val lifecycleViewmodelKtx = lifecycleKtx
-
     const val gradleVersionsPlugin = "0.39.0"
 }
 
@@ -21,9 +17,9 @@ object AndroidSdk {
 
 object Deps {
     object AndroidX {
-        const val benchmarkMacroJunit4 = "androidx.benchmark:benchmark-macro-junit4:1.2.0"
-        const val benchmarkJunit4 = "androidx.benchmark:benchmark-junit4:1.2.0"
-        const val testEspressoCore = "androidx.test.espresso:espresso-core:3.4.0"
+        const val benchmarkMacroJunit4 = "androidx.benchmark:benchmark-macro-junit4:1.2.2"
+        const val benchmarkJunit4 = "androidx.benchmark:benchmark-junit4:1.2.2"
+        const val testEspressoCore = "androidx.test.espresso:espresso-core:3.5.1"
         const val testExtJunit = "androidx.test.ext:junit:1.1.5"
         const val testUiautomator = "androidx.test.uiautomator:uiautomator:2.2.0"
     }
diff --git a/compose-desktop/build.gradle.kts b/compose-desktop/build.gradle.kts
index ae194380..2569347f 100644
--- a/compose-desktop/build.gradle.kts
+++ b/compose-desktop/build.gradle.kts
@@ -19,3 +19,7 @@ application {
     mainClass.set("MainKt")
 }
 
+compose {
+    kotlinCompilerPlugin.set(libs.versions.jbComposeCompiler)
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin}")
+}
\ No newline at end of file
diff --git a/compose-web-wasm/build.gradle.kts b/compose-web-wasm/build.gradle.kts
index 2f152a56..aa2f91dd 100644
--- a/compose-web-wasm/build.gradle.kts
+++ b/compose-web-wasm/build.gradle.kts
@@ -60,6 +60,6 @@ compose.experimental {
 }
 
 compose {
-    kotlinCompilerPlugin.set("1.5.3")
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.20")
+    kotlinCompilerPlugin.set(libs.versions.jbComposeCompiler)
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin}")
 }
\ No newline at end of file
diff --git a/compose-web/build.gradle.kts b/compose-web/build.gradle.kts
index 8c060ad5..603d7e9e 100644
--- a/compose-web/build.gradle.kts
+++ b/compose-web/build.gradle.kts
@@ -41,5 +41,5 @@ afterEvaluate {
 
 compose {
     kotlinCompilerPlugin.set(libs.versions.jbComposeCompiler)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.20")
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin}")
 }
diff --git a/gradle.properties b/gradle.properties
index 174f0d26..d6593c37 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -34,4 +34,4 @@ org.jetbrains.compose.experimental.uikit.enabled=true
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 
-#kotlin.experimental.tryK2=true
\ No newline at end of file
+kotlin.experimental.tryK2=true
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7d2bbdd7..cec1561f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-kotlin = "1.9.20"
-ksp = "1.9.20-1.0.14"
+kotlin = "1.9.21"
+ksp = "1.9.21-1.0.15"
 coroutines = "1.8.0-RC"
 kotlinxSerialization = "1.6.2"
 kotlinxDateTime = "0.5.0"
@@ -13,8 +13,8 @@ sqlDelight = "2.0.0"
 kmpNativeCoroutines = "1.0.0-ALPHA-21"
 
 androidxActivity = "1.8.1"
-androidxComposeCompiler = "1.5.5"
-jbComposeCompiler = "1.5.3"
+androidxComposeCompiler = "1.5.5-dev-k1.9.21-163bb051fe5"
+jbComposeCompiler = "1.5.4"
 androidxComposeBom = "2023.10.01"
 androidxNavigationCompose = "2.7.5"
 wearCompose = "1.2.1"
@@ -31,7 +31,7 @@ glanceAppWidget = "1.0.0"
 junit = "4.13.2"
 robolectric = "4.11.1"
 
-multiplatformSettings = "1.1.0"
+multiplatformSettings = "1.1.1"
 kermit = "2.0.2"
 
 gradleVersionsPlugin = "0.39.0"