From c9a7b15e8657e06b41638cc70dea953dd7a3896b Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 27 Aug 2021 17:17:27 +0300 Subject: [PATCH] Migrate to Kotlin 1.5.30 --- components/build.gradle.kts | 2 +- components/gradle.properties | 2 +- .../kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt | 2 +- gradle-plugins/gradle.properties | 2 +- templates/desktop-template/build.gradle.kts | 4 ++-- templates/multiplatform-template/build.gradle.kts | 4 ++-- templates/web-template/build.gradle.kts | 4 ++-- web/buildSrc/build.gradle.kts | 2 +- .../main-template/build.gradle.kts | 2 +- web/gradle.properties | 4 ++-- web/settings.gradle.kts | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/components/build.gradle.kts b/components/build.gradle.kts index b24228ee1d..6dbdb19eab 100644 --- a/components/build.gradle.kts +++ b/components/build.gradle.kts @@ -10,7 +10,7 @@ buildscript { dependencies { classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion") // __KOTLIN_COMPOSE_VERSION__ - classpath(kotlin("gradle-plugin", version = "1.5.21")) + classpath(kotlin("gradle-plugin", version = "1.5.30")) } } diff --git a/components/gradle.properties b/components/gradle.properties index d61dcdb7a9..2a97371d4b 100644 --- a/components/gradle.properties +++ b/components/gradle.properties @@ -4,4 +4,4 @@ android.enableJetifier=true kotlin.code.style=official # __LATEST_COMPOSE_RELEASE_VERSION__ -compose.version=1.0.0-alpha1 +compose.version=0.0.0-sync-2021-08-27-build327 diff --git a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt index ceac76b168..b7b8ae01ef 100644 --- a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt +++ b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt @@ -8,6 +8,6 @@ package org.jetbrains.compose.test @Suppress("EnumEntryName") enum class TestKotlinVersion(val versionString: String) { // __KOTLIN_COMPOSE_VERSION__ - Default("1.5.21"), + Default("1.5.30"), V1_5_20("1.5.20") } \ No newline at end of file diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index c1419cc009..76cfd47b02 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.5.0-build262 +compose.version=0.0.0-sync-2021-08-27-build327 compose.with.web=false # A version of Gradle plugin, that will be published, diff --git a/templates/desktop-template/build.gradle.kts b/templates/desktop-template/build.gradle.kts index c6a0b393f5..ac3f413066 100644 --- a/templates/desktop-template/build.gradle.kts +++ b/templates/desktop-template/build.gradle.kts @@ -3,9 +3,9 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat plugins { // __KOTLIN_COMPOSE_VERSION__ - kotlin("jvm") version "1.5.21" + kotlin("jvm") version "1.5.30" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha3") + id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.0.0-sync-2021-08-27-build327") } repositories { diff --git a/templates/multiplatform-template/build.gradle.kts b/templates/multiplatform-template/build.gradle.kts index 631c3f9c89..6b0f73173f 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") ?: "1.0.0-alpha3" + val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.0.0-sync-2021-08-27-build327" repositories { mavenCentral() @@ -12,7 +12,7 @@ buildscript { classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion") classpath("com.android.tools.build:gradle:4.1.3") // __KOTLIN_COMPOSE_VERSION__ - classpath(kotlin("gradle-plugin", version = "1.5.21")) + classpath(kotlin("gradle-plugin", version = "1.5.30")) } } diff --git a/templates/web-template/build.gradle.kts b/templates/web-template/build.gradle.kts index 57e88a1176..4860669a1f 100644 --- a/templates/web-template/build.gradle.kts +++ b/templates/web-template/build.gradle.kts @@ -3,9 +3,9 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat plugins { // __KOTLIN_COMPOSE_VERSION__ - kotlin("multiplatform") version "1.5.21" + kotlin("multiplatform") version "1.5.30" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version ("1.0.0-alpha1") + id("org.jetbrains.compose") version ("0.0.0-sync-2021-08-27-build327") } repositories { diff --git a/web/buildSrc/build.gradle.kts b/web/buildSrc/build.gradle.kts index e1bd854525..30162436e7 100644 --- a/web/buildSrc/build.gradle.kts +++ b/web/buildSrc/build.gradle.kts @@ -10,5 +10,5 @@ repositories { } plugins { - id("org.jetbrains.kotlin.jvm") version "1.5.21" + id("org.jetbrains.kotlin.jvm") version "1.5.30" } diff --git a/web/compose-compiler-integration/main-template/build.gradle.kts b/web/compose-compiler-integration/main-template/build.gradle.kts index 04b3a5a6fd..2f3e62f08b 100644 --- a/web/compose-compiler-integration/main-template/build.gradle.kts +++ b/web/compose-compiler-integration/main-template/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.5.21" + kotlin("multiplatform") version "1.5.30" id("org.jetbrains.compose") } diff --git a/web/gradle.properties b/web/gradle.properties index 59aaa5057e..dfb44f843f 100644 --- a/web/gradle.properties +++ b/web/gradle.properties @@ -1,6 +1,6 @@ # __LATEST_COMPOSE_RELEASE_VERSION__ -COMPOSE_CORE_VERSION=1.0.0-alpha4-build321 -COMPOSE_WEB_VERSION=1.0.0-alpha4 +COMPOSE_CORE_VERSION=0.0.0-sync-2021-08-27-build327 +COMPOSE_WEB_VERSION=0.0.0-sync-2021-08-27-build327 compose.web.buildSamples=false compose.web.tests.integration.withFirefox compose.web.tests.skip.benchmarks=false diff --git a/web/settings.gradle.kts b/web/settings.gradle.kts index fd760eebbf..530d042824 100644 --- a/web/settings.gradle.kts +++ b/web/settings.gradle.kts @@ -18,7 +18,7 @@ pluginManagement { println("[build] compose core version: ${extra["COMPOSE_CORE_VERSION"]}") useModule("org.jetbrains.compose:org.jetbrains.compose.gradle.plugin:${extra["COMPOSE_CORE_VERSION"]}") } else if (requested.id.id == "org.jetbrains.kotlin.multiplatform") { - useModule("org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:1.5.21") + useModule("org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:1.5.30") } } }