From 178d2fb59d26362b2bea7b9cd2162e2d0cbeec2b Mon Sep 17 00:00:00 2001
From: "oleksandr.karpovich" <a.n.karpovich@gmail.com>
Date: Wed, 6 Sep 2023 12:07:33 +0200
Subject: [PATCH] Update versions to CM 1.5.1 and kotlin 1.9.10

---
 VERSIONING.md                                               | 1 +
 ci/compose-uber-jar/gradle.properties                       | 2 +-
 ci/templates/desktop-template/gradle.properties             | 4 ++--
 ci/templates/html-library-template/gradle.properties        | 4 ++--
 ci/templates/multiplatform-template/gradle.properties       | 4 ++--
 .../integrations/composable-test-cases/gradle.properties    | 6 +++---
 examples/chat/gradle.properties                             | 4 ++--
 examples/cocoapods-ios-example/gradle.properties            | 4 ++--
 examples/codeviewer/gradle.properties                       | 4 ++--
 examples/falling-balls/gradle.properties                    | 4 ++--
 examples/html/compose-bird/gradle.properties                | 4 ++--
 examples/html/compose-in-js/gradle.properties               | 4 ++--
 examples/html/landing/gradle.properties                     | 4 ++--
 examples/html/with-react/gradle.properties                  | 4 ++--
 examples/imageviewer/gradle.properties                      | 4 ++--
 examples/intellij-plugin/gradle.properties                  | 4 ++--
 examples/interop/ios-compose-in-swiftui/gradle.properties   | 4 ++--
 examples/interop/ios-compose-in-uikit/gradle.properties     | 4 ++--
 examples/interop/ios-swiftui-in-compose/gradle.properties   | 4 ++--
 examples/interop/ios-uikit-in-compose/gradle.properties     | 4 ++--
 examples/issues/gradle.properties                           | 4 ++--
 examples/minesweeper/gradle.properties                      | 4 ++--
 examples/notepad/gradle.properties                          | 4 ++--
 examples/todoapp-lite/gradle.properties                     | 4 ++--
 examples/visual-effects/gradle.properties                   | 4 ++--
 examples/widgets-gallery/gradle.properties                  | 4 ++--
 gradle-plugins/gradle.properties                            | 2 +-
 html/buildSrc/gradle.properties                             | 2 +-
 html/gradle.properties                                      | 2 +-
 tutorials/HTML/Getting_Started/README.md                    | 4 ++--
 30 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/VERSIONING.md b/VERSIONING.md
index dfd636f481..a4be6f9f5e 100644
--- a/VERSIONING.md
+++ b/VERSIONING.md
@@ -40,6 +40,7 @@ Kotlin version | Minimal Compose version | Notes
 1.8.21 | 1.4.3
 1.8.22 | 1.4.3
 1.9.0 | 1.4.3
+1.9.10 | 1.5.1
 
 ### Using the latest Kotlin version 
 
diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties
index 71ea5ce3d2..a4721c9a21 100644
--- a/ci/compose-uber-jar/gradle.properties
+++ b/ci/compose-uber-jar/gradle.properties
@@ -1,2 +1,2 @@
-compose.version=1.5.0
+compose.version=1.5.1
 kotlin.code.style=official
diff --git a/ci/templates/desktop-template/gradle.properties b/ci/templates/desktop-template/gradle.properties
index 30f4fe00fc..1e2d69b4ed 100644
--- a/ci/templates/desktop-template/gradle.properties
+++ b/ci/templates/desktop-template/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
-kotlin.version=1.9.0
-compose.version=1.5.0
+kotlin.version=1.9.10
+compose.version=1.5.1
diff --git a/ci/templates/html-library-template/gradle.properties b/ci/templates/html-library-template/gradle.properties
index 30f4fe00fc..1e2d69b4ed 100644
--- a/ci/templates/html-library-template/gradle.properties
+++ b/ci/templates/html-library-template/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
-kotlin.version=1.9.0
-compose.version=1.5.0
+kotlin.version=1.9.10
+compose.version=1.5.1
diff --git a/ci/templates/multiplatform-template/gradle.properties b/ci/templates/multiplatform-template/gradle.properties
index 6d0fddaa87..817ad7211a 100644
--- a/ci/templates/multiplatform-template/gradle.properties
+++ b/ci/templates/multiplatform-template/gradle.properties
@@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
-kotlin.version=1.9.0
+kotlin.version=1.9.10
 agp.version=7.1.3
-compose.version=1.5.0
+compose.version=1.5.1
diff --git a/compose/integrations/composable-test-cases/gradle.properties b/compose/integrations/composable-test-cases/gradle.properties
index 6fd9a02218..b663a23a44 100644
--- a/compose/integrations/composable-test-cases/gradle.properties
+++ b/compose/integrations/composable-test-cases/gradle.properties
@@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx2048M -XX:MaxMetaspaceSize=512m
 kotlin.code.style=official
 kotlin.native.enableDependencyPropagation=false
 android.useAndroidX=true
-kotlin.version=1.9.0
+kotlin.version=1.9.10
 agp.version=7.3.0
-compose.version=1.5.0-beta02
+compose.version=1.5.1
 kotlin.native.cacheKind=none
 
 #empty by default - a default version will be used
-compose.kotlinCompilerPluginVersion=1.5.0
+compose.kotlinCompilerPluginVersion=1.5.2
 
 # default|failingJs - see enum class CasesToRun
 tests.casesToRun=default
diff --git a/examples/chat/gradle.properties b/examples/chat/gradle.properties
index b20da046f4..3171ccd3f6 100644
--- a/examples/chat/gradle.properties
+++ b/examples/chat/gradle.properties
@@ -9,6 +9,6 @@ kotlin.native.useEmbeddableCompilerJar=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.9.0
+kotlin.version=1.9.10
 agp.version=8.0.2
-compose.version=1.5.0
+compose.version=1.5.1
diff --git a/examples/cocoapods-ios-example/gradle.properties b/examples/cocoapods-ios-example/gradle.properties
index 3c7269b376..85ae4d7542 100644
--- a/examples/cocoapods-ios-example/gradle.properties
+++ b/examples/cocoapods-ios-example/gradle.properties
@@ -19,6 +19,6 @@ android.minSdk=24
 org.jetbrains.compose.experimental.uikit.enabled=true
 
 #Versions
-kotlin.version=1.9.0
+kotlin.version=1.9.10
 agp.version=8.0.2
-compose.version=1.5.0
\ No newline at end of file
+compose.version=1.5.1
\ No newline at end of file
diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties
index b20da046f4..3171ccd3f6 100644
--- a/examples/codeviewer/gradle.properties
+++ b/examples/codeviewer/gradle.properties
@@ -9,6 +9,6 @@ kotlin.native.useEmbeddableCompilerJar=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.9.0
+kotlin.version=1.9.10
 agp.version=8.0.2
-compose.version=1.5.0
+compose.version=1.5.1
diff --git a/examples/falling-balls/gradle.properties b/examples/falling-balls/gradle.properties
index 5b3b452527..2e30567e90 100644
--- a/examples/falling-balls/gradle.properties
+++ b/examples/falling-balls/gradle.properties
@@ -9,9 +9,9 @@ kotlin.native.useEmbeddableCompilerJar=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.9.0
+kotlin.version=1.9.10
 agp.version=8.0.2
-compose.version=1.5.0
+compose.version=1.5.1
 
 # TODO: remove when switching to 1.9.10. See: https://youtrack.jetbrains.com/issue/KT-60852
 # usage: ./gradlew :jsApp:jsBrowserRun -Pworkaround.kotlin.js.kt60852=true
diff --git a/examples/html/compose-bird/gradle.properties b/examples/html/compose-bird/gradle.properties
index 829a12c47b..fc44899271 100644
--- a/examples/html/compose-bird/gradle.properties
+++ b/examples/html/compose-bird/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.9.0
-compose.version=1.5.0
+kotlin.version=1.9.10
+compose.version=1.5.1
diff --git a/examples/html/compose-in-js/gradle.properties b/examples/html/compose-in-js/gradle.properties
index 5fe44a0eff..f03863f366 100644
--- a/examples/html/compose-in-js/gradle.properties
+++ b/examples/html/compose-in-js/gradle.properties
@@ -2,5 +2,5 @@ kotlin.code.style=official
 kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.native.enableDependencyPropagation=false
 kotlin.js.webpack.major.version=4
-kotlin.version=1.9.0
-compose.version=1.5.0
+kotlin.version=1.9.10
+compose.version=1.5.1
diff --git a/examples/html/landing/gradle.properties b/examples/html/landing/gradle.properties
index 829a12c47b..fc44899271 100644
--- a/examples/html/landing/gradle.properties
+++ b/examples/html/landing/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.9.0
-compose.version=1.5.0
+kotlin.version=1.9.10
+compose.version=1.5.1
diff --git a/examples/html/with-react/gradle.properties b/examples/html/with-react/gradle.properties
index 829a12c47b..fc44899271 100644
--- a/examples/html/with-react/gradle.properties
+++ b/examples/html/with-react/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.9.0
-compose.version=1.5.0
+kotlin.version=1.9.10
+compose.version=1.5.1
diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties
index a009ea93e4..6087fc3f96 100644
--- a/examples/imageviewer/gradle.properties
+++ b/examples/imageviewer/gradle.properties
@@ -9,6 +9,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.native.useEmbeddableCompilerJar=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.9.0
+kotlin.version=1.9.10
 agp.version=8.0.2
-compose.version=1.5.0
+compose.version=1.5.1
diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties
index 829a12c47b..fc44899271 100644
--- a/examples/intellij-plugin/gradle.properties
+++ b/examples/intellij-plugin/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.9.0
-compose.version=1.5.0
+kotlin.version=1.9.10
+compose.version=1.5.1
diff --git a/examples/interop/ios-compose-in-swiftui/gradle.properties b/examples/interop/ios-compose-in-swiftui/gradle.properties
index b387f19eb9..d90ce5fa88 100644
--- a/examples/interop/ios-compose-in-swiftui/gradle.properties
+++ b/examples/interop/ios-compose-in-swiftui/gradle.properties
@@ -2,5 +2,5 @@ kotlin.code.style=official
 xcodeproj=./iosApp
 org.gradle.jvmargs=-Xmx3g
 org.jetbrains.compose.experimental.uikit.enabled=true
-kotlin.version=1.9.0
-compose.version=1.5.0
+kotlin.version=1.9.10
+compose.version=1.5.1
diff --git a/examples/interop/ios-compose-in-uikit/gradle.properties b/examples/interop/ios-compose-in-uikit/gradle.properties
index 97e6defaa8..0846aada9a 100644
--- a/examples/interop/ios-compose-in-uikit/gradle.properties
+++ b/examples/interop/ios-compose-in-uikit/gradle.properties
@@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xmx3g
 org.jetbrains.compose.experimental.uikit.enabled=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.9.0
-compose.version=1.5.0
+kotlin.version=1.9.10
+compose.version=1.5.1
diff --git a/examples/interop/ios-swiftui-in-compose/gradle.properties b/examples/interop/ios-swiftui-in-compose/gradle.properties
index 97e6defaa8..0846aada9a 100644
--- a/examples/interop/ios-swiftui-in-compose/gradle.properties
+++ b/examples/interop/ios-swiftui-in-compose/gradle.properties
@@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xmx3g
 org.jetbrains.compose.experimental.uikit.enabled=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.9.0
-compose.version=1.5.0
+kotlin.version=1.9.10
+compose.version=1.5.1
diff --git a/examples/interop/ios-uikit-in-compose/gradle.properties b/examples/interop/ios-uikit-in-compose/gradle.properties
index 97e6defaa8..0846aada9a 100644
--- a/examples/interop/ios-uikit-in-compose/gradle.properties
+++ b/examples/interop/ios-uikit-in-compose/gradle.properties
@@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xmx3g
 org.jetbrains.compose.experimental.uikit.enabled=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.9.0
-compose.version=1.5.0
+kotlin.version=1.9.10
+compose.version=1.5.1
diff --git a/examples/issues/gradle.properties b/examples/issues/gradle.properties
index 91b1441c0d..ab64d77fbe 100644
--- a/examples/issues/gradle.properties
+++ b/examples/issues/gradle.properties
@@ -19,6 +19,6 @@ kotlin.code.style=official
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-kotlin.version=1.9.0
+kotlin.version=1.9.10
 agp.version=8.0.2
-compose.version=1.5.0
+compose.version=1.5.1
diff --git a/examples/minesweeper/gradle.properties b/examples/minesweeper/gradle.properties
index 5b3b452527..2e30567e90 100644
--- a/examples/minesweeper/gradle.properties
+++ b/examples/minesweeper/gradle.properties
@@ -9,9 +9,9 @@ kotlin.native.useEmbeddableCompilerJar=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.9.0
+kotlin.version=1.9.10
 agp.version=8.0.2
-compose.version=1.5.0
+compose.version=1.5.1
 
 # TODO: remove when switching to 1.9.10. See: https://youtrack.jetbrains.com/issue/KT-60852
 # usage: ./gradlew :jsApp:jsBrowserRun -Pworkaround.kotlin.js.kt60852=true
diff --git a/examples/notepad/gradle.properties b/examples/notepad/gradle.properties
index 30f4fe00fc..1e2d69b4ed 100644
--- a/examples/notepad/gradle.properties
+++ b/examples/notepad/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
-kotlin.version=1.9.0
-compose.version=1.5.0
+kotlin.version=1.9.10
+compose.version=1.5.1
diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties
index b20da046f4..3171ccd3f6 100755
--- a/examples/todoapp-lite/gradle.properties
+++ b/examples/todoapp-lite/gradle.properties
@@ -9,6 +9,6 @@ kotlin.native.useEmbeddableCompilerJar=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.9.0
+kotlin.version=1.9.10
 agp.version=8.0.2
-compose.version=1.5.0
+compose.version=1.5.1
diff --git a/examples/visual-effects/gradle.properties b/examples/visual-effects/gradle.properties
index 7161fece97..40e32276bd 100644
--- a/examples/visual-effects/gradle.properties
+++ b/examples/visual-effects/gradle.properties
@@ -9,6 +9,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.native.useEmbeddableCompilerJar=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.9.0
+kotlin.version=1.9.10
 agp.version=8.0.2
-compose.version=1.5.0
+compose.version=1.5.1
diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties
index b20da046f4..3171ccd3f6 100644
--- a/examples/widgets-gallery/gradle.properties
+++ b/examples/widgets-gallery/gradle.properties
@@ -9,6 +9,6 @@ kotlin.native.useEmbeddableCompilerJar=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.9.0
+kotlin.version=1.9.10
 agp.version=8.0.2
-compose.version=1.5.0
+compose.version=1.5.1
diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties
index 7c26d24fab..fe6abc3421 100644
--- a/gradle-plugins/gradle.properties
+++ b/gradle-plugins/gradle.properties
@@ -2,7 +2,7 @@ org.gradle.parallel=true
 kotlin.code.style=official
 
 # Default version of Compose Libraries used by Gradle plugin
-compose.version=1.5.0
+compose.version=1.5.1
 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI.
 compose.tests.compiler.version=1.5.2
 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.
diff --git a/html/buildSrc/gradle.properties b/html/buildSrc/gradle.properties
index 4a14484b30..bb474a25d4 100644
--- a/html/buildSrc/gradle.properties
+++ b/html/buildSrc/gradle.properties
@@ -1 +1 @@
-kotlin.version=1.8.21
+kotlin.version=1.9.10
diff --git a/html/gradle.properties b/html/gradle.properties
index abb0259d3d..bdbc07d50f 100644
--- a/html/gradle.properties
+++ b/html/gradle.properties
@@ -1,4 +1,4 @@
-compose.version=1.5.0-dev1107
+compose.version=1.5.1
 compose.web.buildSamples=false
 compose.web.tests.integration.withFirefox
 compose.web.tests.skip.benchmarks=false
diff --git a/tutorials/HTML/Getting_Started/README.md b/tutorials/HTML/Getting_Started/README.md
index 5be286a42f..8b87e2ce21 100644
--- a/tutorials/HTML/Getting_Started/README.md
+++ b/tutorials/HTML/Getting_Started/README.md
@@ -36,8 +36,8 @@ pluginManagement {
 ``` kotlin
 // Add compose gradle plugin
 plugins {
-    kotlin("multiplatform") version "1.9.0"
-    id("org.jetbrains.compose") version "1.5.0"
+    kotlin("multiplatform") version "1.9.10"
+    id("org.jetbrains.compose") version "1.5.1"
 }
 
 // Add maven repositories