Update all versions for 1.3.1 + update Changelog (#2856)

* Add changes for 1.3.1 + update Changelog Versions: compose 1.3.1 kotlin 1.8.10 compiler: 1.4.2 * revert version update in experimental examples * Update CHANGELOG.md
JetBrains · Mar 10, 2023 · 0b429b6 · 0b429b6
1 parent 31823c5
commit 0b429b6
Show file tree

Hide file tree

Showing 31 changed files with 91 additions and 59 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,31 @@
+# 1.3.1 (March 2023)
+
+## Common
+
+- Added support for Kotlin 1.8.10
+
+### Fixes
+- [Layout in movableContent](https://github.com/JetBrains/compose-multiplatform-core/pull/413)
+- [Unzip wix to build directory](https://github.com/JetBrains/compose-multiplatform/pull/2838)
+
+## Desktop
+
+### Fixes
+- [Korean text input](https://github.com/JetBrains/compose-multiplatform-core/pull/406)
+- [Size UndecoratedWindowResizer to the size of the window](https://github.com/JetBrains/compose-multiplatform-core/pull/388)
+- [Fix sizing a window with unspecified size to its content's size](https://github.com/JetBrains/compose-multiplatform-core/pull/401)
+
+## Dependencies
+This version of Compose Multiplatform is based on the next Jetpack Compose libraries:
+- [Compiler 1.4.2](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.4.2)
+- [Runtime 1.3.3](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.3.3)
+- [UI 1.3.3](https://developer.android.com/jetpack/androidx/releases/compose-ui#1.3.3)
+- [Foundation 1.3.1](https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.3.1)
+- [Material 1.3.1](https://developer.android.com/jetpack/androidx/releases/compose-material#1.3.1)
+- [Material3 1.0.1](https://developer.android.com/jetpack/androidx/releases/compose-material3#1.0.1)
+
+___
+
 # 1.3.0 (January 2023)
 
 ## Common

diff --git a/VERSIONING.md b/VERSIONING.md
@@ -33,6 +33,7 @@ Kotlin version | Minimal Compose version | Notes
 1.7.20 | 1.2.0 | JS is not supported (fixed in the 1.2.1)
 1.7.20 | 1.2.1
 1.8.0  | 1.3.0 | 1.3.0 is not supported by earlier k/native versions
+1.8.10 | 1.3.1
 
 ### Using the latest Kotlin version 
 
@@ -45,10 +46,10 @@ The compilation process of composable functions is handled by the Compose compil
 First, check [this page](https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility) to find a compatible version. If there is one, use it this way:
 ```
 compose {
-    kotlinCompilerPlugin.set("androidx.compose.compiler:compiler:1.4.0")
+    kotlinCompilerPlugin.set("androidx.compose.compiler:compiler:1.4.2")
 }
 ```
-(`1.4.0` corresponds Kotlin 1.8.0)
+(`1.4.2` corresponds Kotlin 1.8.10)
 
 #### Disabling Kotlin compatibility check
 

diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties
@@ -1,2 +1,2 @@
-compose.version=1.3.0
+compose.version=1.3.1
 kotlin.code.style=official
diff --git a/components/gradle.properties b/components/gradle.properties
@@ -3,9 +3,9 @@ android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
 # __KOTLIN_COMPOSE_VERSION__
-kotlin.version=1.8.0
+kotlin.version=1.8.10
 # __LATEST_COMPOSE_RELEASE_VERSION__
-compose.version=1.3.0
+compose.version=1.3.1
 agp.version=7.3.1
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.macos.enabled=true

diff --git a/compose/integrations/composable-test-cases/gradle.properties b/compose/integrations/composable-test-cases/gradle.properties
@@ -4,11 +4,11 @@ kotlin.native.enableDependencyPropagation=false
 android.useAndroidX=true
 kotlin.version=1.8.10
 agp.version=7.3.0
-compose.version=1.3.0
+compose.version=1.3.1
 kotlin.native.cacheKind=none
 
 #empty by default - a default version will be used
-compose.kotlinCompilerPluginVersion=1.4.2-rc03
+compose.kotlinCompilerPluginVersion=1.4.2
 
 # default|failingJs - see enum class CasesToRun
 tests.casesToRun=default

diff --git a/compose/integrations/compose-with-ktx-serialization/gradle.properties b/compose/integrations/compose-with-ktx-serialization/gradle.properties
@@ -1,13 +1,13 @@
 kotlin.code.style=official
 kotlin.native.enableDependencyPropagation=false
 android.useAndroidX=true
-kotlin.version=1.8.0
+kotlin.version=1.8.10
 agp.version=7.3.0
-compose.version=1.3.0-rc02
+compose.version=1.3.1
 org.jetbrains.compose.experimental.uikit.enabled=true
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.macos.enabled=true
 kotlinx.serializationCore=1.4.1
 
 #empty by default - a default version will be used
-compose.kotlinCompilerPluginVersion=
+compose.kotlinCompilerPluginVersion=
diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties
@@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.8.0
+kotlin.version=1.8.10
 agp.version=7.1.3
-compose.version=1.3.0
+compose.version=1.3.1
diff --git a/examples/falling-balls/gradle.properties b/examples/falling-balls/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.8.0
-compose.version=1.3.0
+kotlin.version=1.8.10
+compose.version=1.3.1
diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties
@@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.8.0
+kotlin.version=1.8.10
 agp.version=7.1.3
-compose.version=1.3.0
+compose.version=1.3.1
diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.8.0
-compose.version=1.3.0
+kotlin.version=1.8.10
+compose.version=1.3.1
diff --git 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.8.0
+kotlin.version=1.8.10
 agp.version=7.1.3
-compose.version=1.3.0
+compose.version=1.3.1
diff --git 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.8.0
-compose.version=1.3.0
+kotlin.version=1.8.10
+compose.version=1.3.1
diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties
@@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.8.0
+kotlin.version=1.8.10
 agp.version=7.1.3
-compose.version=1.3.0
+compose.version=1.3.1
diff --git a/examples/todoapp/gradle.properties b/examples/todoapp/gradle.properties
@@ -27,5 +27,5 @@ kotlin.native.disableCompilerDaemon=true
 # After updating Compose Multiplatform version, update corresponding Jetpack Compose versions
 # in Android module (search "Workaround for https://github.com/JetBrains/compose-jb/issues/2340")
 #TODO also change version in buildSrc/gradle.properties
-kotlin.version=1.8.0
-compose.version=1.3.0
+kotlin.version=1.8.10
+compose.version=1.3.1
diff --git a/examples/visual-effects/gradle.properties b/examples/visual-effects/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.8.0
-compose.version=1.3.0
+kotlin.version=1.8.10
+compose.version=1.3.1
diff --git a/examples/web-compose-bird/gradle.properties b/examples/web-compose-bird/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.8.0
-compose.version=1.3.0
+kotlin.version=1.8.10
+compose.version=1.3.1
diff --git a/examples/web-compose-in-js/gradle.properties b/examples/web-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.8.0
-compose.version=1.3.0
+kotlin.version=1.8.10
+compose.version=1.3.1
diff --git a/examples/web-landing/gradle.properties b/examples/web-landing/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.8.0
-compose.version=1.3.0
+kotlin.version=1.8.10
+compose.version=1.3.1
diff --git a/examples/web-with-react/gradle.properties b/examples/web-with-react/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.8.0
-compose.version=1.3.0
+kotlin.version=1.8.10
+compose.version=1.3.1
diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties
@@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.8.0
-compose.version=1.3.0
+kotlin.version=1.8.10
+compose.version=1.3.1
 agp.version=7.1.3
diff --git a/experimental/examples/chat-mpp/gradle.properties b/experimental/examples/chat-mpp/gradle.properties
@@ -13,4 +13,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.native.binary.memoryModel=experimental
 kotlin.version=1.8.0
 agp.version=7.1.3
-compose.version=1.4.0-alpha01-dev954
+compose.version=1.4.0-alpha01-dev954
diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt
@@ -7,7 +7,8 @@ internal object ComposeCompilerCompatibility {
     private val kotlinToCompiler = sortedMapOf(
         "1.7.10" to "1.3.0",
         "1.7.20" to "1.3.2.2",
-        "1.8.0" to "1.4.0"
+        "1.8.0" to "1.4.0",
+        "1.8.10" to "1.4.2",
     )
 
     fun compilerVersionFor(kotlinVersion: String): String {

diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties
@@ -2,13 +2,13 @@ org.gradle.parallel=true
 kotlin.code.style=official
 
 # Default version of Compose Libraries used by Gradle plugin
-compose.version=1.3.0
+compose.version=1.3.1
 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI.
-compose.tests.compiler.version=1.4.0
+compose.tests.compiler.version=1.4.2
 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.
-compose.tests.compiler.compatible.kotlin.version=1.8.0
+compose.tests.compiler.compatible.kotlin.version=1.8.10
 # The latest version of Kotlin compatible with compose.tests.compiler.version for JS target. Used only on CI.
-compose.tests.js.compiler.compatible.kotlin.version=1.8.0
+compose.tests.js.compiler.compatible.kotlin.version=1.8.10
 # __SUPPORTED_GRADLE_VERSIONS__
 compose.tests.gradle.versions=7.0.2, 8.0-rc-1
 

diff --git a/templates/desktop-template/gradle.properties b/templates/desktop-template/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
-kotlin.version=1.8.0
-compose.version=1.3.0
+kotlin.version=1.8.10
+compose.version=1.3.1
diff --git a/templates/multiplatform-template/gradle.properties b/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.8.0
+kotlin.version=1.8.10
 agp.version=7.1.3
-compose.version=1.3.0
+compose.version=1.3.1
diff --git a/templates/web-template/gradle.properties b/templates/web-template/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
-kotlin.version=1.8.0
-compose.version=1.3.0
+kotlin.version=1.8.10
+compose.version=1.3.1
diff --git a/tools/replaceVersion.sh b/tools/replaceVersion.sh
@@ -8,12 +8,14 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/..
 declare -a folders=(
     "templates"
     "examples"
+    #"experimental/examples"
     "gradle-plugins"
     "components"
     "ci"
     "web"
     "tutorials"
-    "experimental/examples"
+    "compose/integrations/composable-test-cases"
+    "compose/integrations/compose-with-ktx-serialization"
 )
 
 if [ -z "$1" ]; then

diff --git a/tutorials/Getting_Started/README.md b/tutorials/Getting_Started/README.md
@@ -42,8 +42,8 @@ The Compose plugin version used in the wizard above might not be the latest. Upd
 For the latest versions, see the [latest versions](https://github.com/JetBrains/compose-multiplatform/releases) site and the [Kotlin](https://kotlinlang.org/) site.
 ```
 plugins {
-    kotlin("jvm") version "1.8.0"
-    id("org.jetbrains.compose") version "1.3.0"
+    kotlin("jvm") version "1.8.10"
+    id("org.jetbrains.compose") version "1.3.1"
 }
 ```
 
@@ -76,8 +76,8 @@ pluginManagement {
 Then create `build.gradle.kts` with the following content:
 ``` kotlin
 plugins {
-    kotlin("jvm") version "1.8.0"
-    id("org.jetbrains.compose") version "1.3.0"
+    kotlin("jvm") version "1.8.10"
+    id("org.jetbrains.compose") version "1.3.1"
 }
 
 repositories {

diff --git a/tutorials/Web/Getting_Started/README.md b/tutorials/Web/Getting_Started/README.md
@@ -40,8 +40,8 @@ pluginManagement {
 ``` kotlin
 // Add compose gradle plugin
 plugins {
-    kotlin("multiplatform") version "1.8.0"
-    id("org.jetbrains.compose") version "1.3.0"
+    kotlin("multiplatform") version "1.8.10"
+    id("org.jetbrains.compose") version "1.3.1"
 }
 
 // Add maven repositories

diff --git a/web/buildSrc/gradle.properties b/web/buildSrc/gradle.properties
@@ -1 +1 @@
-kotlin.version=1.8.0
+kotlin.version=1.8.10
diff --git a/web/gradle.properties b/web/gradle.properties
@@ -1,4 +1,4 @@
-compose.version=1.3.0
+compose.version=1.3.1
 compose.web.buildSamples=false
 compose.web.tests.integration.withFirefox
 compose.web.tests.skip.benchmarks=false