diff --git a/components/gradle.properties b/components/gradle.properties index 4af5ff308b..b59c37819d 100644 --- 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.10 +kotlin.version=1.8.20 # __LATEST_COMPOSE_RELEASE_VERSION__ -compose.version=1.3.1 +compose.version=1.4.0 agp.version=7.3.1 org.jetbrains.compose.experimental.jscanvas.enabled=true org.jetbrains.compose.experimental.macos.enabled=true diff --git a/examples/chat/gradle.properties b/examples/chat/gradle.properties index 4a9b1c5004..517f619720 100644 --- a/examples/chat/gradle.properties +++ b/examples/chat/gradle.properties @@ -13,4 +13,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.20 agp.version=7.1.3 -compose.version=1.4.0-rc03 +compose.version=1.4.0 diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties index 4a9b1c5004..517f619720 100644 --- a/examples/codeviewer/gradle.properties +++ b/examples/codeviewer/gradle.properties @@ -13,4 +13,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.20 agp.version=7.1.3 -compose.version=1.4.0-rc03 +compose.version=1.4.0 diff --git a/examples/falling-balls/gradle.properties b/examples/falling-balls/gradle.properties index 4a9b1c5004..517f619720 100644 --- a/examples/falling-balls/gradle.properties +++ b/examples/falling-balls/gradle.properties @@ -13,4 +13,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.20 agp.version=7.1.3 -compose.version=1.4.0-rc03 +compose.version=1.4.0 diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties index 797762305d..bd9fdada36 100644 --- a/examples/imageviewer/gradle.properties +++ b/examples/imageviewer/gradle.properties @@ -13,4 +13,4 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.20 agp.version=7.1.3 -compose.version=1.4.0-rc03 +compose.version=1.4.0 diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties index 130f9fa7ab..474df6e5ff 100644 --- a/examples/intellij-plugin/gradle.properties +++ b/examples/intellij-plugin/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official -kotlin.version=1.8.10 -compose.version=1.3.1 +kotlin.version=1.8.20 +compose.version=1.4.0 diff --git a/examples/issues/gradle.properties b/examples/issues/gradle.properties index 57141b20aa..47de28a2b2 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.8.10 +kotlin.version=1.8.20 agp.version=7.1.3 -compose.version=1.3.1 +compose.version=1.4.0 diff --git a/examples/minesweeper/gradle.properties b/examples/minesweeper/gradle.properties index 4a9b1c5004..517f619720 100644 --- a/examples/minesweeper/gradle.properties +++ b/examples/minesweeper/gradle.properties @@ -13,4 +13,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.20 agp.version=7.1.3 -compose.version=1.4.0-rc03 +compose.version=1.4.0 diff --git a/examples/notepad/gradle.properties b/examples/notepad/gradle.properties index 65e2e28bfe..07f4975408 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.8.10 -compose.version=1.3.1 +kotlin.version=1.8.20 +compose.version=1.4.0 diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties index 4a9b1c5004..517f619720 100755 --- a/examples/todoapp-lite/gradle.properties +++ b/examples/todoapp-lite/gradle.properties @@ -13,4 +13,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.20 agp.version=7.1.3 -compose.version=1.4.0-rc03 +compose.version=1.4.0 diff --git a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt index 3e959eec51..5743652321 100644 --- a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt +++ b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt @@ -89,7 +89,7 @@ object Deps { object Squareup { object SQLDelight { - private const val VERSION = "1.5.3" + private const val VERSION = "1.5.5" const val gradlePlugin = "com.squareup.sqldelight:gradle-plugin:$VERSION" const val androidDriver = "com.squareup.sqldelight:android-driver:$VERSION" diff --git a/examples/todoapp/buildSrc/gradle.properties b/examples/todoapp/buildSrc/gradle.properties index b1ad58902d..3e039f1f4d 100755 --- a/examples/todoapp/buildSrc/gradle.properties +++ b/examples/todoapp/buildSrc/gradle.properties @@ -1,3 +1,3 @@ # TODO can we get rid of duplication with root gradle.properties? -kotlin.version=1.7.10 -compose.version=1.4.0-rc01 \ No newline at end of file +kotlin.version=1.8.20 +compose.version=1.4.0 \ No newline at end of file diff --git a/examples/todoapp/gradle.properties b/examples/todoapp/gradle.properties index 53dc9d5050..04fd0babcd 100755 --- 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.10 -compose.version=1.4.0-rc01 +kotlin.version=1.8.20 +compose.version=1.4.0 diff --git a/examples/visual-effects/gradle.properties b/examples/visual-effects/gradle.properties index d9e5c20a73..cad8e0734a 100644 --- a/examples/visual-effects/gradle.properties +++ b/examples/visual-effects/gradle.properties @@ -13,4 +13,4 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.20 agp.version=7.1.3 -compose.version=1.4.0-rc03 +compose.version=1.4.0 diff --git a/examples/web-compose-bird/gradle.properties b/examples/web-compose-bird/gradle.properties index 130f9fa7ab..474df6e5ff 100644 --- 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.10 -compose.version=1.3.1 +kotlin.version=1.8.20 +compose.version=1.4.0 diff --git a/examples/web-compose-in-js/gradle.properties b/examples/web-compose-in-js/gradle.properties index f4481ccc00..d33e722294 100644 --- 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.10 -compose.version=1.3.1 +kotlin.version=1.8.20 +compose.version=1.4.0 diff --git a/examples/web-landing/gradle.properties b/examples/web-landing/gradle.properties index 130f9fa7ab..474df6e5ff 100644 --- a/examples/web-landing/gradle.properties +++ b/examples/web-landing/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official -kotlin.version=1.8.10 -compose.version=1.3.1 +kotlin.version=1.8.20 +compose.version=1.4.0 diff --git a/examples/web-with-react/gradle.properties b/examples/web-with-react/gradle.properties index 130f9fa7ab..474df6e5ff 100644 --- 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.10 -compose.version=1.3.1 +kotlin.version=1.8.20 +compose.version=1.4.0 diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties index 4a9b1c5004..517f619720 100644 --- a/examples/widgets-gallery/gradle.properties +++ b/examples/widgets-gallery/gradle.properties @@ -13,4 +13,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.20 agp.version=7.1.3 -compose.version=1.4.0-rc03 +compose.version=1.4.0 diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index 3bb017858a..eec52b8866 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.4.0-rc03 +compose.version=1.4.0 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI. compose.tests.compiler.version=1.4.5 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI. diff --git a/templates/desktop-template/gradle.properties b/templates/desktop-template/gradle.properties index 65e2e28bfe..07f4975408 100644 --- 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.10 -compose.version=1.3.1 +kotlin.version=1.8.20 +compose.version=1.4.0 diff --git a/templates/multiplatform-template/gradle.properties b/templates/multiplatform-template/gradle.properties index b6b0366ce2..478e86d36f 100644 --- 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.10 +kotlin.version=1.8.20 agp.version=7.1.3 -compose.version=1.3.1 +compose.version=1.4.0 diff --git a/templates/web-template/gradle.properties b/templates/web-template/gradle.properties index 65e2e28bfe..07f4975408 100644 --- 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.10 -compose.version=1.3.1 +kotlin.version=1.8.20 +compose.version=1.4.0