From 37e33fba29333cf1e6d2cab4a7ac2864e2f54ade Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Tue, 11 Oct 2022 17:49:32 +0200 Subject: [PATCH] Compose 1.2.0-rc02 --- ci/compose-uber-jar/gradle.properties | 2 +- components/gradle.properties | 2 +- examples/codeviewer/gradle.properties | 2 +- examples/falling-balls/gradle.properties | 2 +- examples/imageviewer/gradle.properties | 2 +- examples/intellij-plugin/gradle.properties | 2 +- examples/issues/gradle.properties | 2 +- examples/notepad/gradle.properties | 2 +- examples/todoapp-lite/gradle.properties | 2 +- examples/todoapp/gradle.properties | 2 +- examples/visual-effects/gradle.properties | 2 +- examples/web-compose-bird/gradle.properties | 2 +- examples/web-compose-in-js/gradle.properties | 2 +- examples/web-landing/gradle.properties | 2 +- examples/web-with-react/gradle.properties | 2 +- examples/widgets-gallery/gradle.properties | 2 +- gradle-plugins/gradle.properties | 2 +- templates/desktop-template/gradle.properties | 2 +- templates/multiplatform-template/gradle.properties | 2 +- templates/web-template/gradle.properties | 2 +- tools/replaceVersion.sh | 2 ++ tutorials/Getting_Started/README.md | 8 ++++---- tutorials/Web/Getting_Started/README.md | 4 ++-- web/gradle.properties | 2 +- 24 files changed, 29 insertions(+), 27 deletions(-) diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index 928c9b5b..93bde230 100644 --- a/ci/compose-uber-jar/gradle.properties +++ b/ci/compose-uber-jar/gradle.properties @@ -1,2 +1,2 @@ -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 kotlin.code.style=official diff --git a/components/gradle.properties b/components/gradle.properties index 83e0be44..cd7a566a 100644 --- a/components/gradle.properties +++ b/components/gradle.properties @@ -5,4 +5,4 @@ kotlin.code.style=official # __KOTLIN_COMPOSE_VERSION__ kotlin.version=1.7.20 # __LATEST_COMPOSE_RELEASE_VERSION__ -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties index 0d0509e3..057ba731 100644 --- a/examples/codeviewer/gradle.properties +++ b/examples/codeviewer/gradle.properties @@ -21,4 +21,4 @@ android.enableJetifier=true kotlin.code.style=official kotlin.version=1.7.20 agp.version=7.1.3 -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 diff --git a/examples/falling-balls/gradle.properties b/examples/falling-balls/gradle.properties index 8d7f796b..f4ebd03d 100644 --- a/examples/falling-balls/gradle.properties +++ b/examples/falling-balls/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official kotlin.version=1.7.20 -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties index 0d0509e3..057ba731 100755 --- a/examples/imageviewer/gradle.properties +++ b/examples/imageviewer/gradle.properties @@ -21,4 +21,4 @@ android.enableJetifier=true kotlin.code.style=official kotlin.version=1.7.20 agp.version=7.1.3 -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties index 8d7f796b..f4ebd03d 100644 --- a/examples/intellij-plugin/gradle.properties +++ b/examples/intellij-plugin/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official kotlin.version=1.7.20 -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 diff --git a/examples/issues/gradle.properties b/examples/issues/gradle.properties index 4361eecc..493e76ce 100644 --- a/examples/issues/gradle.properties +++ b/examples/issues/gradle.properties @@ -21,4 +21,4 @@ android.useAndroidX=true android.enableJetifier=true kotlin.version=1.7.20 agp.version=7.1.3 -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 diff --git a/examples/notepad/gradle.properties b/examples/notepad/gradle.properties index eb043fcd..7ad2c4ba 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.7.20 -compose.version=1.2.0-rc01 \ No newline at end of file +compose.version=1.2.0-rc02 \ No newline at end of file diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties index 0d0509e3..057ba731 100755 --- a/examples/todoapp-lite/gradle.properties +++ b/examples/todoapp-lite/gradle.properties @@ -21,4 +21,4 @@ android.enableJetifier=true kotlin.code.style=official kotlin.version=1.7.20 agp.version=7.1.3 -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 diff --git a/examples/todoapp/gradle.properties b/examples/todoapp/gradle.properties index a284a0de..382de835 100755 --- a/examples/todoapp/gradle.properties +++ b/examples/todoapp/gradle.properties @@ -25,4 +25,4 @@ kotlin.native.disableCompilerDaemon=true #TODO also change version in buildSrc/gradle.properties kotlin.version=1.7.10 -compose.version=1.2.0-rc01 \ No newline at end of file +compose.version=1.2.0-rc02 \ No newline at end of file diff --git a/examples/visual-effects/gradle.properties b/examples/visual-effects/gradle.properties index 8d7f796b..f4ebd03d 100644 --- a/examples/visual-effects/gradle.properties +++ b/examples/visual-effects/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official kotlin.version=1.7.20 -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 diff --git a/examples/web-compose-bird/gradle.properties b/examples/web-compose-bird/gradle.properties index 9d34324f..58633d49 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.7.10 -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 diff --git a/examples/web-compose-in-js/gradle.properties b/examples/web-compose-in-js/gradle.properties index 38934502..9b4af6cb 100644 --- a/examples/web-compose-in-js/gradle.properties +++ b/examples/web-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.7.10 -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 diff --git a/examples/web-landing/gradle.properties b/examples/web-landing/gradle.properties index 9d34324f..58633d49 100644 --- a/examples/web-landing/gradle.properties +++ b/examples/web-landing/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official kotlin.version=1.7.10 -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 diff --git a/examples/web-with-react/gradle.properties b/examples/web-with-react/gradle.properties index 9d34324f..58633d49 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.7.10 -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties index 0ee0925d..994f4e34 100644 --- a/examples/widgets-gallery/gradle.properties +++ b/examples/widgets-gallery/gradle.properties @@ -20,5 +20,5 @@ android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official kotlin.version=1.7.20 -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 agp.version=7.1.3 diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index 19e6acd6..00e78bc4 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.2.0-rc01 +compose.version=1.2.0-rc02 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests. compose.tests.compiler.version=1.3.2 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests. diff --git a/templates/desktop-template/gradle.properties b/templates/desktop-template/gradle.properties index 26e187ab..237a26f3 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.7.20 -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 diff --git a/templates/multiplatform-template/gradle.properties b/templates/multiplatform-template/gradle.properties index 088246bc..642b834d 100644 --- a/templates/multiplatform-template/gradle.properties +++ b/templates/multiplatform-template/gradle.properties @@ -4,4 +4,4 @@ android.enableJetifier=true kotlin.code.style=official kotlin.version=1.7.20 agp.version=7.1.3 -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 diff --git a/templates/web-template/gradle.properties b/templates/web-template/gradle.properties index 0cce43b6..6d87d2da 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.7.10 -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 diff --git a/tools/replaceVersion.sh b/tools/replaceVersion.sh index 5b620083..5fff3033 100755 --- a/tools/replaceVersion.sh +++ b/tools/replaceVersion.sh @@ -46,6 +46,8 @@ replaceVersionInFile() { replaceVersion 'id("org.jetbrains.compose") version ".*"' 'id("org.jetbrains.compose") version "'"$COMPOSE_VERSION"'"' $1 replaceVersion '"org.jetbrains.compose:compose-gradle-plugin:.*"' '"org.jetbrains.compose:compose-gradle-plugin:'"$COMPOSE_VERSION"'"' $1 replaceVersion '^kotlin.version=.*' 'kotlin.version='"$KOTLIN_VERSION"'' $1 + replaceVersion 'kotlin("multiplatform") version ".*"' 'kotlin("multiplatform") version "'"$KOTLIN_VERSION"'"' $1 + replaceVersion 'kotlin("jvm") version ".*"' 'kotlin("jvm") version "'"$KOTLIN_VERSION"'"' $1 } replaceVersionInFolder() { diff --git a/tutorials/Getting_Started/README.md b/tutorials/Getting_Started/README.md index 89a44ed7..b85d8998 100644 --- a/tutorials/Getting_Started/README.md +++ b/tutorials/Getting_Started/README.md @@ -44,8 +44,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-jb/releases) site and the [Kotlin](https://kotlinlang.org/) site. ``` plugins { - kotlin("jvm") version "1.6.10" - id("org.jetbrains.compose") version "1.2.0-rc01" + kotlin("jvm") version "1.7.20" + id("org.jetbrains.compose") version "1.2.0-rc02" } ``` @@ -80,8 +80,8 @@ Then create `build.gradle.kts` with the following content: import org.jetbrains.compose.compose plugins { - kotlin("jvm") version "1.6.10" - id("org.jetbrains.compose") version "1.2.0-rc01" + kotlin("jvm") version "1.7.20" + id("org.jetbrains.compose") version "1.2.0-rc02" } repositories { diff --git a/tutorials/Web/Getting_Started/README.md b/tutorials/Web/Getting_Started/README.md index 6e93128c..c9f93f53 100644 --- a/tutorials/Web/Getting_Started/README.md +++ b/tutorials/Web/Getting_Started/README.md @@ -38,8 +38,8 @@ pluginManagement { ``` kotlin // Add compose gradle plugin plugins { - kotlin("multiplatform") version "1.6.10" - id("org.jetbrains.compose") version "1.2.0-rc01" + kotlin("multiplatform") version "1.7.10" + id("org.jetbrains.compose") version "1.2.0-rc02" } // Add maven repositories diff --git a/web/gradle.properties b/web/gradle.properties index 4562441b..fcfaf12f 100644 --- a/web/gradle.properties +++ b/web/gradle.properties @@ -1,4 +1,4 @@ -compose.version=1.2.0-rc01 +compose.version=1.2.0-rc02 compose.web.buildSamples=false compose.web.tests.integration.withFirefox compose.web.tests.skip.benchmarks=false