From 10e99c20d9c605b7706d718491b13da574853a51 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Mon, 22 Feb 2021 13:19:43 +0300 Subject: [PATCH] Move to 0.3.0. --- ci/compose-uber-jar/gradle.properties | 2 +- examples/codeviewer/build.gradle.kts | 2 +- examples/falling_balls/build.gradle.kts | 2 +- examples/imageviewer/build.gradle.kts | 2 +- examples/intelliJPlugin/build.gradle.kts | 2 +- examples/issues/build.gradle.kts | 2 +- examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt | 2 +- examples/widgetsgallery/build.gradle.kts | 2 +- gradle-plugins/build.gradle.kts | 2 +- .../kotlin/org/jetbrains/compose/test/TestProperties.kt | 4 ++-- gradle-plugins/gradle.properties | 2 +- templates/desktop-template/build.gradle.kts | 2 +- .../desktop-template/build_and_run_from_cli_example.sh | 6 +++--- templates/multiplatform-template/build.gradle.kts | 2 +- tools/replace.sh | 4 ++-- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index b73aea1df6..f78b69edb6 100644 --- a/ci/compose-uber-jar/gradle.properties +++ b/ci/compose-uber-jar/gradle.properties @@ -1,3 +1,3 @@ # __LATEST_COMPOSE_RELEASE_VERSION__ -compose.version=0.3.0-rc1 +compose.version=0.3.0 kotlin.code.style=official diff --git a/examples/codeviewer/build.gradle.kts b/examples/codeviewer/build.gradle.kts index d643661770..e2709478ce 100644 --- a/examples/codeviewer/build.gradle.kts +++ b/examples/codeviewer/build.gradle.kts @@ -9,7 +9,7 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-rc1") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.4.30")) diff --git a/examples/falling_balls/build.gradle.kts b/examples/falling_balls/build.gradle.kts index bf50cad463..95a8adb32c 100644 --- a/examples/falling_balls/build.gradle.kts +++ b/examples/falling_balls/build.gradle.kts @@ -6,7 +6,7 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("jvm") version "1.4.30" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "0.3.0-rc1" + id("org.jetbrains.compose") version "0.3.0" } group = "me.user" diff --git a/examples/imageviewer/build.gradle.kts b/examples/imageviewer/build.gradle.kts index 664b2a34f2..09dd98b464 100755 --- a/examples/imageviewer/build.gradle.kts +++ b/examples/imageviewer/build.gradle.kts @@ -11,7 +11,7 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-rc1") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.4.30")) diff --git a/examples/intelliJPlugin/build.gradle.kts b/examples/intelliJPlugin/build.gradle.kts index 99919c32d5..181c0bb0f7 100644 --- a/examples/intelliJPlugin/build.gradle.kts +++ b/examples/intelliJPlugin/build.gradle.kts @@ -5,7 +5,7 @@ plugins { java kotlin("jvm") version "1.4.30" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "0.3.0-rc1" + id("org.jetbrains.compose") version "0.3.0" } group = "org.example" diff --git a/examples/issues/build.gradle.kts b/examples/issues/build.gradle.kts index 9309b0b759..aed3948a13 100644 --- a/examples/issues/build.gradle.kts +++ b/examples/issues/build.gradle.kts @@ -9,7 +9,7 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-rc1") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.4.30")) diff --git a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt index 324ca34061..705fa02dfc 100644 --- a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt +++ b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt @@ -13,7 +13,7 @@ object Deps { object Compose { // __LATEST_COMPOSE_RELEASE_VERSION__ // TODO remove exclude(group = "org.jetbrains.compose.desktop") - private const val VERSION = "0.3.0-rc1" + private const val VERSION = "0.3.0" const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION" } } diff --git a/examples/widgetsgallery/build.gradle.kts b/examples/widgetsgallery/build.gradle.kts index 354dab8361..0e8dc30cc5 100644 --- a/examples/widgetsgallery/build.gradle.kts +++ b/examples/widgetsgallery/build.gradle.kts @@ -9,7 +9,7 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-rc1") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.4.30")) diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index 52ce9ea8a4..b6715cea11 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -2,7 +2,7 @@ import com.gradle.publish.PluginBundleExtension plugins { // __KOTLIN_COMPOSE_VERSION__ - kotlin("jvm") version "1.4.20" apply false + kotlin("jvm") version "1.4.30" apply false id("com.gradle.plugin-publish") version "0.10.1" apply false id("de.fuerstenau.buildconfig") version "1.1.8" apply false } diff --git a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt index 43ea5c4740..f099a5d5b1 100644 --- a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt +++ b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt @@ -2,11 +2,11 @@ package org.jetbrains.compose.test object TestProperties { // __KOTLIN_COMPOSE_VERSION__ - val kotlinVersion: String = "1.4.20" + val kotlinVersion: String = "1.4.30" val composeVersion: String get() = System.getProperty("compose.plugin.version")!! val gradleVersionForTests: String get() = System.getProperty("gradle.version.for.tests")!! -} \ No newline at end of file +} diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index c20c2b1908..85e57f7835 100644 --- a/gradle-plugins/gradle.properties +++ b/gradle-plugins/gradle.properties @@ -6,7 +6,7 @@ kotlin.code.style=official # unless overridden by COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION env var. # # __LATEST_COMPOSE_RELEASE_VERSION__ -compose.version=0.3.0-rc1 +compose.version=0.3.0 # A version of Gradle plugin, that will be published, # unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var. diff --git a/templates/desktop-template/build.gradle.kts b/templates/desktop-template/build.gradle.kts index 2d5d660491..c81a78a765 100644 --- a/templates/desktop-template/build.gradle.kts +++ b/templates/desktop-template/build.gradle.kts @@ -5,7 +5,7 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("jvm") version "1.4.30" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.0-rc1") + id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.0") } repositories { diff --git a/templates/desktop-template/build_and_run_from_cli_example.sh b/templates/desktop-template/build_and_run_from_cli_example.sh index bafeaceff8..94afd65e5b 100644 --- a/templates/desktop-template/build_and_run_from_cli_example.sh +++ b/templates/desktop-template/build_and_run_from_cli_example.sh @@ -19,11 +19,11 @@ function mavenDep { } PLATFORM=macos-x64 -SKIKO_VERSION=0.1.18 +SKIKO_VERSION=0.2.13 # __KOTLIN_COMPOSE_VERSION__ -KOTLIN_VERSION=1.4.20 +KOTLIN_VERSION=1.4.30 # __LATEST_COMPOSE_RELEASE_VERSION__ -COMPOSE_VERSION=0.2.0-build132 +COMPOSE_VERSION=0.3.0 COROUTINES_VERSION=1.3.6 COLLECTIONS_VERSION=0.3 SPACE_REPO="https://public.jetbrains.space/p/compose/packages/maven/" diff --git a/templates/multiplatform-template/build.gradle.kts b/templates/multiplatform-template/build.gradle.kts index d7bf308e9f..d6fd8b08cf 100644 --- a/templates/multiplatform-template/build.gradle.kts +++ b/templates/multiplatform-template/build.gradle.kts @@ -1,6 +1,6 @@ buildscript { // __LATEST_COMPOSE_RELEASE_VERSION__ - val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.0-rc1" + val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.0" repositories { // TODO: remove after new build is published diff --git a/tools/replace.sh b/tools/replace.sh index f7f7ef3f77..1539099a3f 100755 --- a/tools/replace.sh +++ b/tools/replace.sh @@ -1,3 +1,3 @@ -OLDVER=0.0.0-unmerged-build39 -NEWVER=0.3.0-rc1 +OLDVER=0.3.0-rc1 +NEWVER=0.3.0 find -E ../ -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$OLDVER/$NEWVER/g" {} \;