From 4ee708c5984aa39a0056975aa38025bae04b75ab Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Tue, 11 Oct 2022 21:20:53 +0200 Subject: [PATCH] Upgrade examples to Compose 1.2.0 --- 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 +- tutorials/Getting_Started/README.md | 4 ++-- tutorials/Web/Getting_Started/README.md | 2 +- web/gradle.properties | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index 93bde230f0..c40ccc968d 100644 --- a/ci/compose-uber-jar/gradle.properties +++ b/ci/compose-uber-jar/gradle.properties @@ -1,2 +1,2 @@ -compose.version=1.2.0-rc02 +compose.version=1.2.0 kotlin.code.style=official diff --git a/components/gradle.properties b/components/gradle.properties index cd7a566a45..e3465edb66 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-rc02 +compose.version=1.2.0 diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties index 057ba731c3..07a190fac2 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-rc02 +compose.version=1.2.0 diff --git a/examples/falling-balls/gradle.properties b/examples/falling-balls/gradle.properties index f4ebd03dbc..dbfb6452d2 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-rc02 +compose.version=1.2.0 diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties index 057ba731c3..07a190fac2 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-rc02 +compose.version=1.2.0 diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties index f4ebd03dbc..dbfb6452d2 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-rc02 +compose.version=1.2.0 diff --git a/examples/issues/gradle.properties b/examples/issues/gradle.properties index 493e76ce9a..6e0cf3e57f 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-rc02 +compose.version=1.2.0 diff --git a/examples/notepad/gradle.properties b/examples/notepad/gradle.properties index 7ad2c4ba67..d97adcef50 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-rc02 \ No newline at end of file +compose.version=1.2.0 \ No newline at end of file diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties index 057ba731c3..07a190fac2 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-rc02 +compose.version=1.2.0 diff --git a/examples/todoapp/gradle.properties b/examples/todoapp/gradle.properties index 382de8358c..19d08d0797 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-rc02 \ No newline at end of file +compose.version=1.2.0 \ No newline at end of file diff --git a/examples/visual-effects/gradle.properties b/examples/visual-effects/gradle.properties index f4ebd03dbc..dbfb6452d2 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-rc02 +compose.version=1.2.0 diff --git a/examples/web-compose-bird/gradle.properties b/examples/web-compose-bird/gradle.properties index 58633d497f..ba79da52a7 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-rc02 +compose.version=1.2.0 diff --git a/examples/web-compose-in-js/gradle.properties b/examples/web-compose-in-js/gradle.properties index 9b4af6cb5b..07f5071b57 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-rc02 +compose.version=1.2.0 diff --git a/examples/web-landing/gradle.properties b/examples/web-landing/gradle.properties index 58633d497f..ba79da52a7 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-rc02 +compose.version=1.2.0 diff --git a/examples/web-with-react/gradle.properties b/examples/web-with-react/gradle.properties index 58633d497f..ba79da52a7 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-rc02 +compose.version=1.2.0 diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties index 994f4e3481..64161edf1a 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-rc02 +compose.version=1.2.0 agp.version=7.1.3 diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index 00e78bc4dd..c8b8f42e47 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-rc02 +compose.version=1.2.0 # 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 237a26f3b5..5c878d8016 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-rc02 +compose.version=1.2.0 diff --git a/templates/multiplatform-template/gradle.properties b/templates/multiplatform-template/gradle.properties index 642b834dac..c32d311951 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-rc02 +compose.version=1.2.0 diff --git a/templates/web-template/gradle.properties b/templates/web-template/gradle.properties index 6d87d2da72..8f61b3884d 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-rc02 +compose.version=1.2.0 diff --git a/tutorials/Getting_Started/README.md b/tutorials/Getting_Started/README.md index b85d8998e1..315e954cf9 100644 --- a/tutorials/Getting_Started/README.md +++ b/tutorials/Getting_Started/README.md @@ -45,7 +45,7 @@ For the latest versions, see the [latest versions](https://github.com/JetBrains/ ``` plugins { kotlin("jvm") version "1.7.20" - id("org.jetbrains.compose") version "1.2.0-rc02" + id("org.jetbrains.compose") version "1.2.0" } ``` @@ -81,7 +81,7 @@ import org.jetbrains.compose.compose plugins { kotlin("jvm") version "1.7.20" - id("org.jetbrains.compose") version "1.2.0-rc02" + id("org.jetbrains.compose") version "1.2.0" } repositories { diff --git a/tutorials/Web/Getting_Started/README.md b/tutorials/Web/Getting_Started/README.md index c9f93f53cd..bdcdb54070 100644 --- a/tutorials/Web/Getting_Started/README.md +++ b/tutorials/Web/Getting_Started/README.md @@ -39,7 +39,7 @@ pluginManagement { // Add compose gradle plugin plugins { kotlin("multiplatform") version "1.7.10" - id("org.jetbrains.compose") version "1.2.0-rc02" + id("org.jetbrains.compose") version "1.2.0" } // Add maven repositories diff --git a/web/gradle.properties b/web/gradle.properties index fcfaf12fc5..42de5f34c3 100644 --- a/web/gradle.properties +++ b/web/gradle.properties @@ -1,4 +1,4 @@ -compose.version=1.2.0-rc02 +compose.version=1.2.0 compose.web.buildSamples=false compose.web.tests.integration.withFirefox compose.web.tests.skip.benchmarks=false