From e69ac23dbf58d18515a05aecf678d30faca947e4 Mon Sep 17 00:00:00 2001 From: Oleksandr Karpovich Date: Wed, 20 Apr 2022 15:33:01 +0200 Subject: [PATCH] Move compose + use kotlin 1.6.21 (#2025) * Move compose * Update kotlin version to 1.6.20 * Move compose + Update kotlin version to 1.6.21 * Move compose to include a fix for compose plugin (kjs specific) Co-authored-by: Oleksandr Karpovich --- components/gradle.properties | 2 +- compose/frameworks/support | 2 +- examples/notepad/gradle.properties | 2 +- examples/todoapp/gradle.properties | 2 +- experimental/examples/falling-balls-mpp/gradle.properties | 2 +- templates/desktop-template/gradle.properties | 2 +- templates/multiplatform-template/gradle.properties | 2 +- templates/web-template/gradle.properties | 2 +- web/build.gradle.kts | 2 +- web/buildSrc/build.gradle.kts | 4 ++-- .../main-template/build.gradle.kts | 2 +- web/settings.gradle.kts | 2 +- .../karma-kotlin-reporter-decorated.js | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/components/gradle.properties b/components/gradle.properties index 8fb205f495..e55148b388 100644 --- a/components/gradle.properties +++ b/components/gradle.properties @@ -3,6 +3,6 @@ android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official # __KOTLIN_COMPOSE_VERSION__ -kotlin.version=1.6.10 +kotlin.version=1.6.21 # __LATEST_COMPOSE_RELEASE_VERSION__ compose.version=1.1.0 diff --git a/compose/frameworks/support b/compose/frameworks/support index f4b9436637..5f528e84a0 160000 --- a/compose/frameworks/support +++ b/compose/frameworks/support @@ -1 +1 @@ -Subproject commit f4b9436637e0391351984ebfa5470ff77051815e +Subproject commit 5f528e84a04008c5c0b037980a5d44ec42d5f0d3 diff --git a/examples/notepad/gradle.properties b/examples/notepad/gradle.properties index 654c3e3d5f..5679ab5bab 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.6.10 -compose.version=1.1.0 \ No newline at end of file +compose.version=1.1.0 diff --git a/examples/todoapp/gradle.properties b/examples/todoapp/gradle.properties index b8b81092a6..a8acb1ace5 100755 --- a/examples/todoapp/gradle.properties +++ b/examples/todoapp/gradle.properties @@ -25,4 +25,4 @@ kotlin.native.disableCompilerDaemon=true #todo remove -Pkotlin.version=1.6.20 from Xcode project, when stable version on Compose with Koltin 1.6.20 or later released kotlin.version=1.6.10 -compose.version=1.1.0 \ No newline at end of file +compose.version=1.1.0 diff --git a/experimental/examples/falling-balls-mpp/gradle.properties b/experimental/examples/falling-balls-mpp/gradle.properties index d0c69fe7c3..a5320812b8 100644 --- a/experimental/examples/falling-balls-mpp/gradle.properties +++ b/experimental/examples/falling-balls-mpp/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx3g compose.version=1.2.0-alpha01-dev620 -kotlin.version=1.6.10 +kotlin.version=1.6.21 kotlin.code.style=official kotlin.native.cacheKind=none kotlin.native.useEmbeddableCompilerJar=true diff --git a/templates/desktop-template/gradle.properties b/templates/desktop-template/gradle.properties index 5679ab5bab..9ee6382dcb 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.6.10 +kotlin.version=1.6.21 compose.version=1.1.0 diff --git a/templates/multiplatform-template/gradle.properties b/templates/multiplatform-template/gradle.properties index c0554eeeca..975ce54deb 100644 --- a/templates/multiplatform-template/gradle.properties +++ b/templates/multiplatform-template/gradle.properties @@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official -kotlin.version=1.6.10 +kotlin.version=1.6.21 agp.version=7.0.4 compose.version=1.1.0 diff --git a/templates/web-template/gradle.properties b/templates/web-template/gradle.properties index 5679ab5bab..9ee6382dcb 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.6.10 +kotlin.version=1.6.21 compose.version=1.1.0 diff --git a/web/build.gradle.kts b/web/build.gradle.kts index 0617f90b25..82d66c4344 100644 --- a/web/build.gradle.kts +++ b/web/build.gradle.kts @@ -42,7 +42,7 @@ subprojects { project.kotlinExtension.targets.forEach { target -> target.compilations.forEach { compilation -> compilation.kotlinOptions { - allWarningsAsErrors = true + allWarningsAsErrors = false // see https://kotlinlang.org/docs/opt-in-requirements.html freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn" } diff --git a/web/buildSrc/build.gradle.kts b/web/buildSrc/build.gradle.kts index c14d462ef7..cd67dfb754 100644 --- a/web/buildSrc/build.gradle.kts +++ b/web/buildSrc/build.gradle.kts @@ -10,7 +10,7 @@ repositories { } plugins { - id("org.jetbrains.kotlin.jvm") version "1.6.10" + id("org.jetbrains.kotlin.jvm") version "1.6.21" } @@ -20,5 +20,5 @@ java { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21") } diff --git a/web/compose-compiler-integration/main-template/build.gradle.kts b/web/compose-compiler-integration/main-template/build.gradle.kts index ac0f279081..85272d8ffa 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.6.10" + kotlin("multiplatform") version "1.6.21" id("org.jetbrains.compose") } diff --git a/web/settings.gradle.kts b/web/settings.gradle.kts index 39cd2ea0b4..ec282c8ad6 100644 --- a/web/settings.gradle.kts +++ b/web/settings.gradle.kts @@ -44,7 +44,7 @@ pluginManagement { if (requested.id.id == "org.jetbrains.compose") { useModule("org.jetbrains.compose:org.jetbrains.compose.gradle.plugin:$COMPOSE_CORE_VERSION") } else if (requested.id.id == "org.jetbrains.kotlin.multiplatform") { - useModule("org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:1.6.10") + useModule("org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:1.6.21") } } } diff --git a/web/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js b/web/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js index a202f11278..314efaf6ec 100644 --- a/web/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js +++ b/web/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js @@ -3,7 +3,7 @@ // logger is needed only to log cases when `browser.id` is not in browserResults const logger = require('../../../build/js/node_modules/karma/lib/logger') -const kotlinReporterModule = require("../../../build/js/packages_imported/kotlin-test-js-runner/1.6.10/karma-kotlin-reporter"); +const kotlinReporterModule = require("../../../build/js/packages_imported/kotlin-test-js-runner/1.6.21/karma-kotlin-reporter"); const KotlinReporter = kotlinReporterModule['reporter:karma-kotlin-reporter'][1];