From 84163e7499023d18b856ae97aa6dbde4c0a56abf Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Thu, 26 Nov 2020 22:30:54 +0300 Subject: [PATCH] Move to 0.2.0-build132 --- benchmarks/build.gradle.kts | 2 +- cef/build.gradle.kts | 2 ++ ci/compose-uber-jar/gradle.properties | 5 +++-- examples/codeviewer/build.gradle.kts | 2 +- examples/imageviewer/build.gradle.kts | 2 +- .../todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt | 2 +- gradle-plugins/gradle.properties | 2 +- templates/desktop-template/build.gradle.kts | 2 +- .../desktop-template/build_and_run_from_cli_example.sh | 8 ++++---- templates/multiplatform-template/build.gradle.kts | 2 +- 10 files changed, 16 insertions(+), 13 deletions(-) diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts index 22382d8490..0e8c085a07 100644 --- a/benchmarks/build.gradle.kts +++ b/benchmarks/build.gradle.kts @@ -6,7 +6,7 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("jvm") version "1.4.20" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "0.2.0-build128" + id("org.jetbrains.compose") version "0.2.0-build132" // __KOTLIN_COMPOSE_VERSION__ kotlin("plugin.allopen") version "1.4.20" id("kotlinx.benchmark") version "0.2.0-dev-20" diff --git a/cef/build.gradle.kts b/cef/build.gradle.kts index 0f432736ab..7096673d1b 100644 --- a/cef/build.gradle.kts +++ b/cef/build.gradle.kts @@ -4,7 +4,9 @@ import de.undercouch.gradle.tasks.download.Download import kotlin.text.capitalize plugins { + // __KOTLIN_COMPOSE_VERSION__ kotlin("jvm") version "1.4.0" + // __LATEST_COMPOSE_RELEASE_VERSION__ id("org.jetbrains.compose") version "0.1.0-dev97" id("de.undercouch.download") version "4.1.1" application diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index 1d98137c0d..e8799addb3 100644 --- a/ci/compose-uber-jar/gradle.properties +++ b/ci/compose-uber-jar/gradle.properties @@ -1,2 +1,3 @@ -compose.version=0.1.0-build63 -kotlin.code.style=official \ No newline at end of file +# __LATEST_COMPOSE_RELEASE_VERSION__ +compose.version=0.2.0-build132 +kotlin.code.style=official diff --git a/examples/codeviewer/build.gradle.kts b/examples/codeviewer/build.gradle.kts index ceec1c6d39..fd6b8915e8 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.2.0-build128") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.2.0-build132") classpath("com.android.tools.build:gradle:4.0.1") classpath(kotlin("gradle-plugin", version = "1.4.20")) } diff --git a/examples/imageviewer/build.gradle.kts b/examples/imageviewer/build.gradle.kts index 10ed616db4..c18dfcd909 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.2.0-build128") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.2.0-build132") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.4.20")) diff --git a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt index ea062256a9..73bc2db527 100644 --- a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt +++ b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt @@ -12,7 +12,7 @@ object Deps { object Compose { // __LATEST_COMPOSE_RELEASE_VERSION__ - private const val VERSION = "0.2.0-build128" + private const val VERSION = "0.2.0-build132" const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION" } } diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index a2166c9f39..cec5af933c 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.2.0-build128 +compose.version=0.2.0-build132 # 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 933b92bec5..af26aa04d3 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.20" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.2.0-build128") + id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.2.0-build132") } 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 d8eb66f2fc..bafeaceff8 100644 --- a/templates/desktop-template/build_and_run_from_cli_example.sh +++ b/templates/desktop-template/build_and_run_from_cli_example.sh @@ -18,15 +18,15 @@ function mavenDep { fi } -PLATFORM=macos -SKIKO_VERSION=0.1.16 +PLATFORM=macos-x64 +SKIKO_VERSION=0.1.18 # __KOTLIN_COMPOSE_VERSION__ KOTLIN_VERSION=1.4.20 # __LATEST_COMPOSE_RELEASE_VERSION__ -COMPOSE_VERSION=0.2.0-build128 +COMPOSE_VERSION=0.2.0-build132 COROUTINES_VERSION=1.3.6 COLLECTIONS_VERSION=0.3 -SPACE_REPO="https://packages.jetbrains.team/maven/p/ui/dev" +SPACE_REPO="https://public.jetbrains.space/p/compose/packages/maven/" MAVEN_CENTRAL="https://repo1.maven.org/maven2" BINTRAY_KOTLINX="https://dl.bintray.com/kotlin/kotlinx" diff --git a/templates/multiplatform-template/build.gradle.kts b/templates/multiplatform-template/build.gradle.kts index ffd5270dd4..1abcef92fe 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.2.0-build128" + val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.2.0-build132" repositories { // TODO: remove after new build is published