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 <oleksandr.karpovich@jetbrains.com>

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

compose/frameworks/support

@@ -1 +1 @@
-Subproject commit f4b9436637e0391351984ebfa5470ff77051815e
+Subproject commit 5f528e84a04008c5c0b037980a5d44ec42d5f0d3

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
+compose.version=1.1.0

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
+compose.version=1.1.0

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

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

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

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

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"
                         }

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")
 }

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")
 }
 

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")
             }
         }
     }

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];