move to kotlin 1.6.10 and corresponding compose

JetBrains · Dec 14, 2021 · 3d5c51b · 3d5c51b
1 parent 7e235b0
commit 3d5c51b
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 24 deletions.
diff --git a/components/gradle.properties b/components/gradle.properties
@@ -2,5 +2,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
-kotlin.version=1.6.10-RC
+kotlin.version=1.6.10
 compose.version=1.0.0
diff --git a/compose/frameworks/support b/compose/frameworks/support
diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties
@@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.6.10-RC
+kotlin.version=1.6.10
 agp.version=4.2.2
 compose.version=1.0.0
diff --git a/examples/falling-balls-web/gradle.properties b/examples/falling-balls-web/gradle.properties
@@ -1,2 +1,2 @@
-kotlin.version=1.6.10-RC
+kotlin.version=1.6.10
 compose.version=1.0.0
diff --git a/examples/falling-balls/gradle.properties b/examples/falling-balls/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.6.10-RC
+kotlin.version=1.6.10
 compose.version=1.0.0
diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties
@@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.6.10-RC
+kotlin.version=1.6.10
 agp.version=4.2.2
 compose.version=1.0.0
diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.6.10-RC
+kotlin.version=1.6.10
 compose.version=1.0.0
diff --git a/examples/issues/gradle.properties b/examples/issues/gradle.properties
@@ -19,6 +19,6 @@ kotlin.code.style=official
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-kotlin.version=1.6.10-RC
+kotlin.version=1.6.10
 agp.version=4.2.2
 compose.version=1.0.0
diff --git 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-RC
+kotlin.version=1.6.10
 compose.version=1.0.0
diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties
@@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.6.10-RC
+kotlin.version=1.6.10
 agp.version=4.2.2
 compose.version=1.0.0
diff --git a/examples/todoapp/buildSrc/gradle.properties b/examples/todoapp/buildSrc/gradle.properties
@@ -1,2 +1,2 @@
-kotlin.version=1.6.10-RC
+kotlin.version=1.6.10
 compose.version=1.0.0
diff --git a/examples/visual-effects/gradle.properties b/examples/visual-effects/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.6.10-RC
+kotlin.version=1.6.10
 compose.version=1.0.0
diff --git a/examples/web-compose-bird/gradle.properties b/examples/web-compose-bird/gradle.properties
@@ -1,4 +1,4 @@
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-kotlin.version=1.6.10-RC
+kotlin.version=1.6.10
 compose.version=1.0.0
diff --git a/examples/web-landing/gradle.properties b/examples/web-landing/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.6.10-RC
+kotlin.version=1.6.10
 compose.version=1.0.0
diff --git a/examples/web-with-react/gradle.properties b/examples/web-with-react/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.6.10-RC
+kotlin.version=1.6.10
 compose.version=1.0.0
diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties
@@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.6.10-RC
+kotlin.version=1.6.10
 compose.version=1.0.0
 agp.version=4.2.2
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
@@ -7,7 +7,7 @@ package org.jetbrains.compose.test
 
 @Suppress("EnumEntryName")
 enum class TestKotlinVersion(val versionString: String) {
-    Default("1.6.10-RC"),
+    Default("1.6.10"),
     V1_5_31("1.5.31"),
     V1_5_20("1.5.20")
 }
diff --git 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-RC
+kotlin.version=1.6.10
 compose.version=1.0.0
diff --git 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-RC
+kotlin.version=1.6.10
 agp.version=4.2.2
 compose.version=1.0.0
diff --git 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-RC
+kotlin.version=1.6.10
 compose.version=1.0.0
diff --git 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-RC"
+    id("org.jetbrains.kotlin.jvm") version "1.6.10"
 }
 
 
@@ -20,5 +20,5 @@ java {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10-RC")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
 }
diff --git 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-RC"
+    kotlin("multiplatform") version "1.6.10"
     id("org.jetbrains.compose")
 }
 

diff --git a/web/settings.gradle.kts b/web/settings.gradle.kts
@@ -46,7 +46,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-RC")
+                useModule("org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:1.6.10")
             }
         }
     }