diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index ab20c3b1b4..38875d51ea 100644 --- a/ci/compose-uber-jar/gradle.properties +++ b/ci/compose-uber-jar/gradle.properties @@ -1,2 +1,2 @@ -compose.version=1.5.11 +compose.version=1.6.0 kotlin.code.style=official diff --git a/ci/templates/desktop-template/gradle.properties b/ci/templates/desktop-template/gradle.properties index cb7bbd86bc..98aed13c99 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.21 -compose.version=1.5.11 +kotlin.version=1.9.22 +compose.version=1.6.0 diff --git a/ci/templates/html-library-template/gradle.properties b/ci/templates/html-library-template/gradle.properties index cb7bbd86bc..98aed13c99 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.21 -compose.version=1.5.11 +kotlin.version=1.9.22 +compose.version=1.6.0 diff --git a/ci/templates/multiplatform-template/gradle.properties b/ci/templates/multiplatform-template/gradle.properties index 75b8747f91..1672037284 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.21 +kotlin.version=1.9.22 agp.version=8.0.2 -compose.version=1.5.11 +compose.version=1.6.0 diff --git a/examples/chat/gradle.properties b/examples/chat/gradle.properties index 39193936c1..f4ce9a785c 100644 --- a/examples/chat/gradle.properties +++ b/examples/chat/gradle.properties @@ -8,6 +8,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.21 +kotlin.version=1.9.22 agp.version=8.0.2 -compose.version=1.5.11 +compose.version=1.6.0 diff --git a/examples/cocoapods-ios-example/gradle.properties b/examples/cocoapods-ios-example/gradle.properties index 4e4d26edf7..666109effa 100644 --- a/examples/cocoapods-ios-example/gradle.properties +++ b/examples/cocoapods-ios-example/gradle.properties @@ -18,6 +18,6 @@ android.minSdk=24 #Compose #Versions -kotlin.version=1.9.21 +kotlin.version=1.9.22 agp.version=8.0.2 -compose.version=1.5.11 \ No newline at end of file +compose.version=1.6.0 \ No newline at end of file diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties index 39193936c1..f4ce9a785c 100644 --- a/examples/codeviewer/gradle.properties +++ b/examples/codeviewer/gradle.properties @@ -8,6 +8,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.21 +kotlin.version=1.9.22 agp.version=8.0.2 -compose.version=1.5.11 +compose.version=1.6.0 diff --git a/examples/graphics-2d/gradle.properties b/examples/graphics-2d/gradle.properties index 03b0eabdfe..c444bd01b8 100644 --- a/examples/graphics-2d/gradle.properties +++ b/examples/graphics-2d/gradle.properties @@ -8,9 +8,9 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.21 +kotlin.version=1.9.22 agp.version=8.0.2 -compose.version=1.5.11 +compose.version=1.6.0 # 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 a6a74725e7..b61a2e5972 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.21 -compose.version=1.5.11 +kotlin.version=1.9.22 +compose.version=1.6.0 diff --git a/examples/html/compose-in-js/gradle.properties b/examples/html/compose-in-js/gradle.properties index a05fda4a7d..7cb358ab31 100644 --- a/examples/html/compose-in-js/gradle.properties +++ b/examples/html/compose-in-js/gradle.properties @@ -1,4 +1,4 @@ kotlin.code.style=official kotlin.js.webpack.major.version=4 -kotlin.version=1.9.21 -compose.version=1.5.11 +kotlin.version=1.9.22 +compose.version=1.6.0 diff --git a/examples/html/landing/gradle.properties b/examples/html/landing/gradle.properties index a6a74725e7..b61a2e5972 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.21 -compose.version=1.5.11 +kotlin.version=1.9.22 +compose.version=1.6.0 diff --git a/examples/html/with-react/gradle.properties b/examples/html/with-react/gradle.properties index a6a74725e7..b61a2e5972 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.21 -compose.version=1.5.11 +kotlin.version=1.9.22 +compose.version=1.6.0 diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties index 4491ab8979..ca5d42305c 100644 --- a/examples/imageviewer/gradle.properties +++ b/examples/imageviewer/gradle.properties @@ -8,6 +8,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.useEmbeddableCompilerJar=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.21 +kotlin.version=1.9.22 agp.version=8.0.2 -compose.version=1.5.11 +compose.version=1.6.0 diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties index a6a74725e7..b61a2e5972 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.21 -compose.version=1.5.11 +kotlin.version=1.9.22 +compose.version=1.6.0 diff --git a/examples/interop/ios-compose-in-swiftui/gradle.properties b/examples/interop/ios-compose-in-swiftui/gradle.properties index fc35ea7495..4f122f8b6e 100644 --- a/examples/interop/ios-compose-in-swiftui/gradle.properties +++ b/examples/interop/ios-compose-in-swiftui/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official xcodeproj=./iosApp org.gradle.jvmargs=-Xmx3g -kotlin.version=1.9.21 -compose.version=1.5.11 +kotlin.version=1.9.22 +compose.version=1.6.0 diff --git a/examples/interop/ios-compose-in-uikit/gradle.properties b/examples/interop/ios-compose-in-uikit/gradle.properties index 9709e7baad..e0ebafa997 100644 --- a/examples/interop/ios-compose-in-uikit/gradle.properties +++ b/examples/interop/ios-compose-in-uikit/gradle.properties @@ -3,5 +3,5 @@ xcodeproj=./iosApp org.gradle.jvmargs=-Xmx3g # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.21 -compose.version=1.5.11 +kotlin.version=1.9.22 +compose.version=1.6.0 diff --git a/examples/interop/ios-swiftui-in-compose/gradle.properties b/examples/interop/ios-swiftui-in-compose/gradle.properties index 9197577af3..e0ebafa997 100644 --- a/examples/interop/ios-swiftui-in-compose/gradle.properties +++ b/examples/interop/ios-swiftui-in-compose/gradle.properties @@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx3g # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.22 -compose.version=1.6.0-rc01 +compose.version=1.6.0 diff --git a/examples/interop/ios-uikit-in-compose/gradle.properties b/examples/interop/ios-uikit-in-compose/gradle.properties index 9709e7baad..e0ebafa997 100644 --- a/examples/interop/ios-uikit-in-compose/gradle.properties +++ b/examples/interop/ios-uikit-in-compose/gradle.properties @@ -3,5 +3,5 @@ xcodeproj=./iosApp org.gradle.jvmargs=-Xmx3g # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.21 -compose.version=1.5.11 +kotlin.version=1.9.22 +compose.version=1.6.0 diff --git a/examples/issues/gradle.properties b/examples/issues/gradle.properties index 28b557bff0..d4a549a70b 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.21 +kotlin.version=1.9.22 agp.version=8.0.2 -compose.version=1.5.11 +compose.version=1.6.0 diff --git a/examples/notepad/gradle.properties b/examples/notepad/gradle.properties index cb7bbd86bc..98aed13c99 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.21 -compose.version=1.5.11 +kotlin.version=1.9.22 +compose.version=1.6.0 diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties index 39193936c1..f4ce9a785c 100755 --- a/examples/todoapp-lite/gradle.properties +++ b/examples/todoapp-lite/gradle.properties @@ -8,6 +8,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.21 +kotlin.version=1.9.22 agp.version=8.0.2 -compose.version=1.5.11 +compose.version=1.6.0 diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties index f8f6769bad..96596e8d80 100644 --- a/examples/widgets-gallery/gradle.properties +++ b/examples/widgets-gallery/gradle.properties @@ -8,7 +8,7 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.21 +kotlin.version=1.9.22 agp.version=8.0.2 # Replace this with release version when it comes out -compose.version=1.6.0-dev1397 +compose.version=1.6.0 diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index 81cb376b75..5e21db2a0a 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.6.0-dev1383 +compose.version=1.6.0 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI. compose.tests.compiler.version=1.5.8.1 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI. diff --git a/tutorials/HTML/Getting_Started/README.md b/tutorials/HTML/Getting_Started/README.md index 23923d8f44..43487576e8 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.21" - id("org.jetbrains.compose") version "1.5.11" + kotlin("multiplatform") version "1.9.22" + id("org.jetbrains.compose") version "1.6.0" } // Add maven repositories