Support/1.5.1 (#3631)

* Update versions to CM 1.5.1 and kotlin 1.9.10

* Add explicit dependencies on compose.ui and compose.foundation in examples/chat/jsApp

* Update CHANGELOG.md

* fix typo

* Add Dependencies for 1.5.1 Changelog

CHANGELOG.md

@@ -1,3 +1,22 @@
+# 1.5.1 (September 2023)
+
+## Common
+
+### Features
+- [Support kotlin 1.9.10](https://github.com/JetBrains/compose-multiplatform/pull/3616)
+
+## Dependencies
+
+This version of Compose Multiplatform is based on the next Jetpack Compose libraries:
+
+- [Compiler 1.5.3](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.5.3)
+- [Runtime 1.5.0](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.5.0)
+- [UI 1.5.0](https://developer.android.com/jetpack/androidx/releases/compose-ui#1.5.0)
+- [Foundation 1.5.0](https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.5.0)
+- [Material 1.5.0](https://developer.android.com/jetpack/androidx/releases/compose-material#1.5.0)
+- [Material3 1.1.1](https://developer.android.com/jetpack/androidx/releases/compose-material3#1.1.1)
+
+
 # 1.5.0 (August 2023)
 > This is a combined changelog from the prerelease versions:
 > - [1.5.0-beta01](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.5.0-beta01)

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 
 

ci/compose-uber-jar/gradle.properties

@@ -1,2 +1,2 @@
-compose.version=1.5.0
+compose.version=1.5.1
 kotlin.code.style=official

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
+kotlin.version=1.9.10
-compose.version=1.5.0
+compose.version=1.5.1

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
+kotlin.version=1.9.10
-compose.version=1.5.0
+compose.version=1.5.1

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

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

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

examples/chat/jsApp/build.gradle.kts

@@ -12,6 +12,8 @@ kotlin {
         val jsMain by getting  {
             dependencies {
                 implementation(project(":shared"))
+                implementation(compose.ui)
+                implementation(compose.foundation)
             }
         }
     }

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
+compose.version=1.5.1

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

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

examples/html/compose-bird/gradle.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.9.0
+kotlin.version=1.9.10
-compose.version=1.5.0
+compose.version=1.5.1

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
+kotlin.version=1.9.10
-compose.version=1.5.0
+compose.version=1.5.1

examples/html/landing/gradle.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.9.0
+kotlin.version=1.9.10
-compose.version=1.5.0
+compose.version=1.5.1

examples/html/with-react/gradle.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.9.0
+kotlin.version=1.9.10
-compose.version=1.5.0
+compose.version=1.5.1

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

examples/intellij-plugin/gradle.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.9.0
+kotlin.version=1.9.10
-compose.version=1.5.0
+compose.version=1.5.1

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
+kotlin.version=1.9.10
-compose.version=1.5.0
+compose.version=1.5.1

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
+kotlin.version=1.9.10
-compose.version=1.5.0
+compose.version=1.5.1

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
+kotlin.version=1.9.10
-compose.version=1.5.0
+compose.version=1.5.1

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
+kotlin.version=1.9.10
-compose.version=1.5.0
+compose.version=1.5.1

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

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

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
+kotlin.version=1.9.10
-compose.version=1.5.0
+compose.version=1.5.1

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

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

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

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.

html/buildSrc/gradle.properties

@@ -1 +1 @@
-kotlin.version=1.8.21
+kotlin.version=1.9.10

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

tutorials/HTML/Getting_Started/README.md

@@ -36,8 +36,8 @@ pluginManagement {
 ``` kotlin
 // Add compose gradle plugin
 plugins {
-    kotlin("multiplatform") version "1.9.0"
+    kotlin("multiplatform") version "1.9.10"
-    id("org.jetbrains.compose") version "1.5.0"
+    id("org.jetbrains.compose") version "1.5.1"
 }
 
 // Add maven repositories