release 1.0.1-rc2 with 1.6.10 (#1590)

* move to kotlin 1.6.10-RC and corresponding compose commit

* Update path to the karma plugin we are patching

* Add ExperimentalComposeWebStyleApi

what worries me that this actually shows that there are some cases where without any changes apart version compiler people will have to worry about such annotations

* update kotlin version in templates to adopt 1.6.10-RC

* web: move ComposableWithNullableTypeParameter.kt to passing test cases

* update kotlin version in other places

* update imageviewer example: add OptIn for experimental API

* move compose

* move to kotlin 1.6.10 and corresponding compose

* move to kotlin 1.6.10 and corresponding compose

* move to 1.0.1-rc2

* move to 1.0.1-rc2 (todoapp)

Co-authored-by: Oleksandr Karpovich <oleksandr.karpovich@jetbrains.com>
Co-authored-by: Shagen Ogandzhanian <shagen.ogandzhanian@jetbrains.com>

ci/compose-uber-jar/gradle.properties

@@ -1,2 +1,2 @@
-compose.version=1.0.0
+compose.version=1.0.1-rc2
 kotlin.code.style=official

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.5.31
+kotlin.version=1.6.10
-compose.version=1.0.0
+compose.version=1.0.1-rc2

compose/frameworks/support

@@ -1 +1 @@
-Subproject commit e2a3108b92d4c54b5780f9eeceb1712845961cd7
+Subproject commit 7dce7a026bf977363d8ab85c407e6efab36f856a

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.5.31
+kotlin.version=1.6.10
 agp.version=4.2.2
-compose.version=1.0.0
+compose.version=1.0.1-rc2

examples/falling-balls-web/gradle.properties

@@ -1,2 +1,2 @@
-kotlin.version=1.5.31
+kotlin.version=1.6.10
-compose.version=1.0.0
+compose.version=1.0.1-rc2

examples/falling-balls/gradle.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.5.31
+kotlin.version=1.6.10
-compose.version=1.0.0
+compose.version=1.0.1-rc2

examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/view/Tooltip.kt

@@ -1,6 +1,7 @@
 package example.imageviewer.view
 
 import androidx.compose.foundation.BoxWithTooltip
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.TooltipArea
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -12,6 +13,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun Tooltip(
     text: String = "Tooltip",
@@ -33,4 +35,4 @@ fun Tooltip(
     ) {
         content()
     }
-}
+}

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.5.31
+kotlin.version=1.6.10
 agp.version=4.2.2
-compose.version=1.0.0
+compose.version=1.0.1-rc2

examples/intellij-plugin/gradle.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.5.31
+kotlin.version=1.6.10
-compose.version=1.0.0
+compose.version=1.0.1-rc2

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.5.31
+kotlin.version=1.6.10
 agp.version=4.2.2
-compose.version=1.0.0
+compose.version=1.0.1-rc2

examples/notepad/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
-kotlin.version=1.5.31
+kotlin.version=1.6.10
-compose.version=1.0.0
+compose.version=1.0.1-rc2

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.5.31
+kotlin.version=1.6.10
 agp.version=4.2.2
-compose.version=1.0.0
+compose.version=1.0.1-rc2

examples/todoapp/buildSrc/gradle.properties

@@ -1,2 +1,2 @@
-kotlin.version=1.5.31
+kotlin.version=1.6.10
-compose.version=1.0.0
+compose.version=1.0.1-rc2

examples/visual-effects/gradle.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.5.31
+kotlin.version=1.6.10
-compose.version=1.0.0
+compose.version=1.0.1-rc2

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.5.31
+kotlin.version=1.6.10
-compose.version=1.0.0
+compose.version=1.0.1-rc2

examples/web-landing/gradle.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.5.31
+kotlin.version=1.6.10
-compose.version=1.0.0
+compose.version=1.0.1-rc2

examples/web-with-react/gradle.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.5.31
+kotlin.version=1.6.10
-compose.version=1.0.0
+compose.version=1.0.1-rc2

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.5.31
+kotlin.version=1.6.10
-compose.version=1.0.0
+compose.version=1.0.1-rc2
 agp.version=4.2.2

gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt

@@ -7,6 +7,7 @@ package org.jetbrains.compose.test
 
 @Suppress("EnumEntryName")
 enum class TestKotlinVersion(val versionString: String) {
-    Default("1.5.31"),
+    Default("1.6.10"),
+    V1_5_31("1.5.31"),
     V1_5_20("1.5.20")
-}
+}

gradle-plugins/gradle.properties

@@ -5,7 +5,7 @@ kotlin.code.style=official
 # that will be used by published Gradle plugin,
 # unless overridden by COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION env var.
 #
-compose.version=1.0.0
+compose.version=1.0.1-rc2
 compose.with.web=false
 
 # A version of Gradle plugin, that will be published,

templates/desktop-template/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
-kotlin.version=1.5.31
+kotlin.version=1.6.10
-compose.version=1.0.0
+compose.version=1.0.1-rc2

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.5.31
+kotlin.version=1.6.10
 agp.version=4.2.2
-compose.version=1.0.0
+compose.version=1.0.1-rc2

templates/web-template/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
-kotlin.version=1.5.31
+kotlin.version=1.6.10
-compose.version=1.0.0
+compose.version=1.0.1-rc2

tutorials/Getting_Started/README.md

@@ -43,8 +43,8 @@ just search for "Compose Multiplatform".
 The Compose plugin version used in the wizard above may be not the last. Update the version of the plugin to the latest available by editing the `build.gradle.kts` file, finding and updating the version information as shown below. For the latest versions, see the [latest versions](https://github.com/JetBrains/compose-jb/releases) site and the [Kotlin](https://kotlinlang.org/) site.
 ```
 plugins {
-    kotlin("jvm") version "1.5.31"
+    kotlin("jvm") version "1.6.10"
-    id("org.jetbrains.compose") version "1.0.0"
+    id("org.jetbrains.compose") version "1.0.1-rc2"
 }
 ```
 
@@ -79,8 +79,8 @@ Then create `build.gradle.kts` with the following content:
 import org.jetbrains.compose.compose
 
 plugins {
-    kotlin("jvm") version "1.5.31"
+    kotlin("jvm") version "1.6.10"
-    id("org.jetbrains.compose") version "1.0.0"
+    id("org.jetbrains.compose") version "1.0.1-rc2"
 }
 
 repositories {

tutorials/Web/Getting_Started/README.md

@@ -38,8 +38,8 @@ pluginManagement {
 ``` kotlin
 // Add compose gradle plugin
 plugins {
-    kotlin("multiplatform") version "1.5.31"
+    kotlin("multiplatform") version "1.6.10"
-    id("org.jetbrains.compose") version "1.0.0"
+    id("org.jetbrains.compose") version "1.0.1-rc2"
 }
 
 // Add maven repositories

web/buildSrc/build.gradle.kts

@@ -1,8 +1,8 @@
 repositories {
     gradlePluginPortal()
     mavenCentral()
-    maven { 
+    maven {
-        url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") 
+        url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
     maven {
         url = uri("https://packages.jetbrains.team/maven/p/ui/dev")
@@ -10,15 +10,15 @@ repositories {
 }
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.5.31"
+    id("org.jetbrains.kotlin.jvm") version "1.6.10"
 }
 
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
-}    
+}
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
 }

web/compose-compiler-integration/README.md

@@ -2,7 +2,7 @@ RUN from project root directory:
 `./gradlew :compose-compiler-integration:checkComposeCases`
 
 To use specific version:
-`./gradlew :compose-compiler-integration:checkComposeCases -PCOMPOSE_CORE_VERSION=1.0.0 -PCOMPOSE_WEB_VERSION=1.0.0
+`./gradlew :compose-compiler-integration:checkComposeCases -PCOMPOSE_CORE_VERSION=1.0.1-rc2 -PCOMPOSE_WEB_VERSION=1.0.1-rc2
 
 To fun only filtered cases (check for contained in file path):
 `./gradlew :compose-compiler-integration:checkComposeCases -PFILTER_CASES=CaseName`

web/compose-compiler-integration/main-template/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("multiplatform") version "1.5.31"
+    kotlin("multiplatform") version "1.6.10"
     id("org.jetbrains.compose")
 }
 

web/gradle.properties

@@ -1,5 +1,5 @@
-COMPOSE_CORE_VERSION=1.0.0
+COMPOSE_CORE_VERSION=1.0.1-rc2
-COMPOSE_WEB_VERSION=1.0.0
+COMPOSE_WEB_VERSION=1.0.1-rc2
 compose.web.buildSamples=false
 compose.web.tests.integration.withFirefox
 compose.web.tests.skip.benchmarks=false

web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/Sample.kt

@@ -14,6 +14,7 @@ import kotlinx.browser.window
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import org.jetbrains.compose.web.ExperimentalComposeWebStyleApi
 import org.jetbrains.compose.web.attributes.*
 import org.jetbrains.compose.web.css.*
 import org.jetbrains.compose.web.dom.*
@@ -119,6 +120,7 @@ fun Counter(value: Int) {
     }
 }
 
+@OptIn(ExperimentalComposeWebStyleApi::class)
 fun main() {
     val urlParams = URLSearchParams(window.location.search)
 

web/settings.gradle.kts

@@ -17,7 +17,7 @@ pluginManagement {
     }
 
     val localProperties: java.util.Properties? = properties("local.properties")
-    
+
 
     val repos = (localProperties?.getProperty("compose.web.repos"))?.split(File.pathSeparator)
 
@@ -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.5.31")
+                useModule("org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:1.6.10")
             }
         }
     }

web/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js

@@ -1,6 +1,6 @@
 // This is a workaround for https://github.com/karma-runner/karma-teamcity-reporter/issues/86
 
-const kotlinReporterModule = require("../../../build/js/packages_imported/kotlin-test-js-runner/1.5.31/karma-kotlin-reporter");
+const kotlinReporterModule = require("../../../build/js/packages_imported/kotlin-test-js-runner/1.6.10/karma-kotlin-reporter");
 
 const KotlinReporter = kotlinReporterModule['reporter:karma-kotlin-reporter'][1];