From e14a99a5170bd25a7338e0be3ad52c0e32a64c15 Mon Sep 17 00:00:00 2001 From: "dima.avdeev" Date: Fri, 29 Sep 2023 14:07:55 +0400 Subject: [PATCH] Update Compose version to 1.5.2 (#3746) --- ci/compose-uber-jar/gradle.properties | 2 +- ci/templates/desktop-template/gradle.properties | 2 +- ci/templates/html-library-template/gradle.properties | 2 +- ci/templates/multiplatform-template/gradle.properties | 2 +- examples/chat/gradle.properties | 2 +- examples/cocoapods-ios-example/gradle.properties | 2 +- examples/codeviewer/gradle.properties | 2 +- examples/falling-balls/gradle.properties | 2 +- examples/html/compose-bird/gradle.properties | 2 +- examples/html/compose-in-js/gradle.properties | 2 +- examples/html/landing/gradle.properties | 2 +- examples/html/with-react/gradle.properties | 2 +- examples/imageviewer/gradle.properties | 2 +- examples/intellij-plugin/gradle.properties | 2 +- examples/interop/ios-compose-in-swiftui/gradle.properties | 2 +- examples/interop/ios-compose-in-uikit/gradle.properties | 2 +- examples/interop/ios-swiftui-in-compose/gradle.properties | 2 +- examples/interop/ios-uikit-in-compose/gradle.properties | 2 +- examples/issues/gradle.properties | 2 +- examples/minesweeper/gradle.properties | 2 +- examples/notepad/gradle.properties | 2 +- examples/todoapp-lite/gradle.properties | 2 +- examples/visual-effects/gradle.properties | 2 +- examples/widgets-gallery/gradle.properties | 2 +- gradle-plugins/gradle.properties | 2 +- tutorials/HTML/Getting_Started/README.md | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index a4721c9a21..21cdea8a3d 100644 --- a/ci/compose-uber-jar/gradle.properties +++ b/ci/compose-uber-jar/gradle.properties @@ -1,2 +1,2 @@ -compose.version=1.5.1 +compose.version=1.5.2 kotlin.code.style=official diff --git a/ci/templates/desktop-template/gradle.properties b/ci/templates/desktop-template/gradle.properties index 1e2d69b4ed..f38317683d 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.10 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/ci/templates/html-library-template/gradle.properties b/ci/templates/html-library-template/gradle.properties index 1e2d69b4ed..f38317683d 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.10 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/ci/templates/multiplatform-template/gradle.properties b/ci/templates/multiplatform-template/gradle.properties index 1a553a85ae..c0845dfbe2 100644 --- a/ci/templates/multiplatform-template/gradle.properties +++ b/ci/templates/multiplatform-template/gradle.properties @@ -4,4 +4,4 @@ android.enableJetifier=true kotlin.code.style=official kotlin.version=1.9.10 agp.version=8.0.2 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/chat/gradle.properties b/examples/chat/gradle.properties index 3171ccd3f6..c2f765215a 100644 --- a/examples/chat/gradle.properties +++ b/examples/chat/gradle.properties @@ -11,4 +11,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.10 agp.version=8.0.2 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/cocoapods-ios-example/gradle.properties b/examples/cocoapods-ios-example/gradle.properties index 85ae4d7542..ad74f4bfd3 100644 --- a/examples/cocoapods-ios-example/gradle.properties +++ b/examples/cocoapods-ios-example/gradle.properties @@ -21,4 +21,4 @@ org.jetbrains.compose.experimental.uikit.enabled=true #Versions kotlin.version=1.9.10 agp.version=8.0.2 -compose.version=1.5.1 \ No newline at end of file +compose.version=1.5.2 \ No newline at end of file diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties index 3171ccd3f6..c2f765215a 100644 --- a/examples/codeviewer/gradle.properties +++ b/examples/codeviewer/gradle.properties @@ -11,4 +11,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.10 agp.version=8.0.2 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/falling-balls/gradle.properties b/examples/falling-balls/gradle.properties index 2e30567e90..73998f2d5e 100644 --- a/examples/falling-balls/gradle.properties +++ b/examples/falling-balls/gradle.properties @@ -11,7 +11,7 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.10 agp.version=8.0.2 -compose.version=1.5.1 +compose.version=1.5.2 # 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 fc44899271..eac7330d49 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.10 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/html/compose-in-js/gradle.properties b/examples/html/compose-in-js/gradle.properties index f03863f366..9a4930525c 100644 --- a/examples/html/compose-in-js/gradle.properties +++ b/examples/html/compose-in-js/gradle.properties @@ -3,4 +3,4 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true kotlin.native.enableDependencyPropagation=false kotlin.js.webpack.major.version=4 kotlin.version=1.9.10 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/html/landing/gradle.properties b/examples/html/landing/gradle.properties index fc44899271..eac7330d49 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.10 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/html/with-react/gradle.properties b/examples/html/with-react/gradle.properties index fc44899271..eac7330d49 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.10 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties index 6087fc3f96..d679c62ede 100644 --- a/examples/imageviewer/gradle.properties +++ b/examples/imageviewer/gradle.properties @@ -11,4 +11,4 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.10 agp.version=8.0.2 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties index fc44899271..eac7330d49 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.10 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/interop/ios-compose-in-swiftui/gradle.properties b/examples/interop/ios-compose-in-swiftui/gradle.properties index d90ce5fa88..6a393189e2 100644 --- a/examples/interop/ios-compose-in-swiftui/gradle.properties +++ b/examples/interop/ios-compose-in-swiftui/gradle.properties @@ -3,4 +3,4 @@ xcodeproj=./iosApp org.gradle.jvmargs=-Xmx3g org.jetbrains.compose.experimental.uikit.enabled=true kotlin.version=1.9.10 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/interop/ios-compose-in-uikit/gradle.properties b/examples/interop/ios-compose-in-uikit/gradle.properties index 0846aada9a..65e21ac13e 100644 --- a/examples/interop/ios-compose-in-uikit/gradle.properties +++ b/examples/interop/ios-compose-in-uikit/gradle.properties @@ -5,4 +5,4 @@ org.jetbrains.compose.experimental.uikit.enabled=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.10 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/interop/ios-swiftui-in-compose/gradle.properties b/examples/interop/ios-swiftui-in-compose/gradle.properties index 0846aada9a..65e21ac13e 100644 --- a/examples/interop/ios-swiftui-in-compose/gradle.properties +++ b/examples/interop/ios-swiftui-in-compose/gradle.properties @@ -5,4 +5,4 @@ org.jetbrains.compose.experimental.uikit.enabled=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.10 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/interop/ios-uikit-in-compose/gradle.properties b/examples/interop/ios-uikit-in-compose/gradle.properties index 0846aada9a..65e21ac13e 100644 --- a/examples/interop/ios-uikit-in-compose/gradle.properties +++ b/examples/interop/ios-uikit-in-compose/gradle.properties @@ -5,4 +5,4 @@ org.jetbrains.compose.experimental.uikit.enabled=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.10 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/issues/gradle.properties b/examples/issues/gradle.properties index ab64d77fbe..a416a41fc2 100644 --- a/examples/issues/gradle.properties +++ b/examples/issues/gradle.properties @@ -21,4 +21,4 @@ android.useAndroidX=true android.enableJetifier=true kotlin.version=1.9.10 agp.version=8.0.2 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/minesweeper/gradle.properties b/examples/minesweeper/gradle.properties index 2e30567e90..73998f2d5e 100644 --- a/examples/minesweeper/gradle.properties +++ b/examples/minesweeper/gradle.properties @@ -11,7 +11,7 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.10 agp.version=8.0.2 -compose.version=1.5.1 +compose.version=1.5.2 # 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/notepad/gradle.properties b/examples/notepad/gradle.properties index 1e2d69b4ed..f38317683d 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.10 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties index 3171ccd3f6..c2f765215a 100755 --- a/examples/todoapp-lite/gradle.properties +++ b/examples/todoapp-lite/gradle.properties @@ -11,4 +11,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.10 agp.version=8.0.2 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/visual-effects/gradle.properties b/examples/visual-effects/gradle.properties index 40e32276bd..51a3f03b2c 100644 --- a/examples/visual-effects/gradle.properties +++ b/examples/visual-effects/gradle.properties @@ -11,4 +11,4 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.10 agp.version=8.0.2 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties index 3171ccd3f6..c2f765215a 100644 --- a/examples/widgets-gallery/gradle.properties +++ b/examples/widgets-gallery/gradle.properties @@ -11,4 +11,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.10 agp.version=8.0.2 -compose.version=1.5.1 +compose.version=1.5.2 diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index fe6abc3421..cafb63b058 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.5.1 +compose.version=1.5.2 # 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. diff --git a/tutorials/HTML/Getting_Started/README.md b/tutorials/HTML/Getting_Started/README.md index 8b87e2ce21..75b9e051d3 100644 --- a/tutorials/HTML/Getting_Started/README.md +++ b/tutorials/HTML/Getting_Started/README.md @@ -37,7 +37,7 @@ pluginManagement { // Add compose gradle plugin plugins { kotlin("multiplatform") version "1.9.10" - id("org.jetbrains.compose") version "1.5.1" + id("org.jetbrains.compose") version "1.5.2" } // Add maven repositories