diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index 80228d2d28..f17262a0e2 100644 --- a/ci/compose-uber-jar/gradle.properties +++ b/ci/compose-uber-jar/gradle.properties @@ -1,2 +1,2 @@ -compose.version=1.6.2 +compose.version=1.6.10 kotlin.code.style=official diff --git a/ci/templates/desktop-template/gradle.properties b/ci/templates/desktop-template/gradle.properties index 7136c76fe1..0ad11509bc 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.23 -compose.version=1.6.2 +kotlin.version=1.9.24 +compose.version=1.6.10 diff --git a/ci/templates/html-library-template/gradle.properties b/ci/templates/html-library-template/gradle.properties index 7136c76fe1..0ad11509bc 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.23 -compose.version=1.6.2 +kotlin.version=1.9.24 +compose.version=1.6.10 diff --git a/ci/templates/multiplatform-template/gradle.properties b/ci/templates/multiplatform-template/gradle.properties index 2526895cee..3295d02ea8 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.23 +kotlin.version=1.9.24 agp.version=8.0.2 -compose.version=1.6.2 +compose.version=1.6.10 diff --git a/examples/chat/gradle.properties b/examples/chat/gradle.properties index db415c227c..6e72829fa4 100644 --- a/examples/chat/gradle.properties +++ b/examples/chat/gradle.properties @@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.23 +kotlin.version=1.9.24 agp.version=8.0.2 -compose.version=1.6.2 +compose.version=1.6.10 diff --git a/examples/cocoapods-ios-example/gradle.properties b/examples/cocoapods-ios-example/gradle.properties index 813754c9b7..6003b3ba0c 100644 --- a/examples/cocoapods-ios-example/gradle.properties +++ b/examples/cocoapods-ios-example/gradle.properties @@ -20,6 +20,6 @@ android.minSdk=24 #Compose #Versions -kotlin.version=1.9.23 +kotlin.version=1.9.24 agp.version=8.0.2 -compose.version=1.6.2 \ No newline at end of file +compose.version=1.6.10 \ No newline at end of file diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties index db415c227c..6e72829fa4 100644 --- a/examples/codeviewer/gradle.properties +++ b/examples/codeviewer/gradle.properties @@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.23 +kotlin.version=1.9.24 agp.version=8.0.2 -compose.version=1.6.2 +compose.version=1.6.10 diff --git a/examples/graphics-2d/gradle.properties b/examples/graphics-2d/gradle.properties index a94ed14119..a469f5f768 100644 --- a/examples/graphics-2d/gradle.properties +++ b/examples/graphics-2d/gradle.properties @@ -10,9 +10,9 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.23 +kotlin.version=1.9.24 agp.version=8.0.2 -compose.version=1.6.2 +compose.version=1.6.10 # 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 cb3f22ea04..fc5c4fc96a 100644 --- a/examples/html/compose-bird/gradle.properties +++ b/examples/html/compose-bird/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -kotlin.version=1.9.23 -compose.version=1.6.2 +kotlin.version=1.9.24 +compose.version=1.6.10 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/html/compose-in-js/gradle.properties b/examples/html/compose-in-js/gradle.properties index 19147f9c4c..2f5bf2db97 100644 --- a/examples/html/compose-in-js/gradle.properties +++ b/examples/html/compose-in-js/gradle.properties @@ -1,6 +1,6 @@ kotlin.code.style=official kotlin.js.webpack.major.version=4 -kotlin.version=1.9.23 -compose.version=1.6.2 +kotlin.version=1.9.24 +compose.version=1.6.10 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/html/landing/gradle.properties b/examples/html/landing/gradle.properties index cb3f22ea04..fc5c4fc96a 100644 --- a/examples/html/landing/gradle.properties +++ b/examples/html/landing/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -kotlin.version=1.9.23 -compose.version=1.6.2 +kotlin.version=1.9.24 +compose.version=1.6.10 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/html/with-react/gradle.properties b/examples/html/with-react/gradle.properties index cb3f22ea04..fc5c4fc96a 100644 --- a/examples/html/with-react/gradle.properties +++ b/examples/html/with-react/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -kotlin.version=1.9.23 -compose.version=1.6.2 +kotlin.version=1.9.24 +compose.version=1.6.10 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties index 2386f89ca6..e8e8ea52bb 100644 --- a/examples/imageviewer/gradle.properties +++ b/examples/imageviewer/gradle.properties @@ -10,6 +10,6 @@ org.gradle.caching=true org.jetbrains.compose.experimental.jscanvas.enabled=true org.jetbrains.compose.experimental.macos.enabled=true org.jetbrains.compose.experimental.wasm.enabled=true -kotlin.version=1.9.23 +kotlin.version=1.9.24 agp.version=8.0.2 -compose.version=1.6.2 +compose.version=1.6.10 diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties index cb3f22ea04..fc5c4fc96a 100644 --- a/examples/intellij-plugin/gradle.properties +++ b/examples/intellij-plugin/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -kotlin.version=1.9.23 -compose.version=1.6.2 +kotlin.version=1.9.24 +compose.version=1.6.10 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/interop/ios-compose-in-swiftui/gradle.properties b/examples/interop/ios-compose-in-swiftui/gradle.properties index 51e38b6607..ff58266530 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.23 -compose.version=1.6.2 +kotlin.version=1.9.24 +compose.version=1.6.10 diff --git a/examples/interop/ios-compose-in-uikit/gradle.properties b/examples/interop/ios-compose-in-uikit/gradle.properties index 362bdead9c..b255e8d0b0 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.23 -compose.version=1.6.2 +kotlin.version=1.9.24 +compose.version=1.6.10 diff --git a/examples/interop/ios-swiftui-in-compose/gradle.properties b/examples/interop/ios-swiftui-in-compose/gradle.properties index 362bdead9c..b255e8d0b0 100644 --- a/examples/interop/ios-swiftui-in-compose/gradle.properties +++ b/examples/interop/ios-swiftui-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.23 -compose.version=1.6.2 +kotlin.version=1.9.24 +compose.version=1.6.10 diff --git a/examples/interop/ios-uikit-in-compose/gradle.properties b/examples/interop/ios-uikit-in-compose/gradle.properties index 362bdead9c..b255e8d0b0 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.23 -compose.version=1.6.2 +kotlin.version=1.9.24 +compose.version=1.6.10 diff --git a/examples/issues/gradle.properties b/examples/issues/gradle.properties index 98b10d6424..81555830da 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.23 +kotlin.version=1.9.24 agp.version=8.0.2 -compose.version=1.6.2 +compose.version=1.6.10 diff --git a/examples/jetsnack/gradle.properties b/examples/jetsnack/gradle.properties index 68f4e8f265..fa843193e5 100644 --- a/examples/jetsnack/gradle.properties +++ b/examples/jetsnack/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx3g kotlin.code.style=official android.useAndroidX=true agp.version=8.0.2 -kotlin.version=1.9.23 -compose.version=1.6.2 +kotlin.version=1.9.24 +compose.version=1.6.10 # TODO: enable configuration cache once we update on kotlin 2.0 # see https://youtrack.jetbrains.com/issue/KT-64851 (k/wasm issue) diff --git a/examples/notepad/gradle.properties b/examples/notepad/gradle.properties index bd8bb181cf..8307202045 100644 --- a/examples/notepad/gradle.properties +++ b/examples/notepad/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official -kotlin.version=1.9.23 -compose.version=1.6.2 +kotlin.version=1.9.24 +compose.version=1.6.10 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties index db415c227c..6e72829fa4 100755 --- a/examples/todoapp-lite/gradle.properties +++ b/examples/todoapp-lite/gradle.properties @@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.23 +kotlin.version=1.9.24 agp.version=8.0.2 -compose.version=1.6.2 +compose.version=1.6.10 diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties index 61ac58395e..f3d9a645de 100644 --- a/examples/widgets-gallery/gradle.properties +++ b/examples/widgets-gallery/gradle.properties @@ -10,7 +10,7 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.23 +kotlin.version=1.9.24 agp.version=8.0.2 # Replace this with release version when it comes out -compose.version=1.6.2 +compose.version=1.6.10 diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index be4979a69b..ecce3d9625 100644 --- a/gradle-plugins/gradle.properties +++ b/gradle-plugins/gradle.properties @@ -8,7 +8,7 @@ kotlin.code.style=official dev.junit.parallel=false # Default version of Compose Libraries used by Gradle plugin -compose.version=1.6.10-dev1590 +compose.version=1.6.10 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI. compose.tests.compiler.version=1.5.14 # 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 dd617c0a0c..695724d762 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.23" - id("org.jetbrains.compose") version "1.6.2" + kotlin("multiplatform") version "1.9.24" + id("org.jetbrains.compose") version "1.6.10" } // Add maven repositories