Move to Kotlin 1.5.10 and Compose 0.4.0-rc1

4 years ago · bf4f7051a2
18 changed files with 31 additions and 31 deletions
--- a/ci/compose-uber-jar/gradle.properties
+++ b/ci/compose-uber-jar/gradle.properties
@ -1,3 +1,3 @@
 # __LATEST_COMPOSE_RELEASE_VERSION__
-compose.version=0.4.0-build209
+compose.version=0.4.0-rc1
 kotlin.code.style=official
--- a/components/build.gradle.kts
+++ b/components/build.gradle.kts
@ -1,6 +1,6 @@
 buildscript {
    // __LATEST_COMPOSE_RELEASE_VERSION__
-    val composeVersion = System.getenv("COMPOSE_RELEASE_VERSION") ?: "0.4.0-build209"
+    val composeVersion = System.getenv("COMPOSE_RELEASE_VERSION") ?: "0.4.0-rc1"

    repositories {
        google()
@ -11,7 +11,7 @@ buildscript {
    dependencies {
        classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion")
        // __KOTLIN_COMPOSE_VERSION__
-        classpath(kotlin("gradle-plugin", version = "1.5.0"))
+        classpath(kotlin("gradle-plugin", version = "1.5.10"))
    }
 }

--- a/examples/codeviewer/build.gradle.kts
+++ b/examples/codeviewer/build.gradle.kts
@ -9,10 +9,10 @@ buildscript {

    dependencies {
        // __LATEST_COMPOSE_RELEASE_VERSION__
-        classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build209")
+        classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-rc1")
        classpath("com.android.tools.build:gradle:4.0.1")
         // __KOTLIN_COMPOSE_VERSION__
-        classpath(kotlin("gradle-plugin", version = "1.5.0"))
+        classpath(kotlin("gradle-plugin", version = "1.5.10"))
    }
 }

--- a/examples/falling_balls/build.gradle.kts
+++ b/examples/falling_balls/build.gradle.kts
@ -4,9 +4,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

 plugins {
    // __KOTLIN_COMPOSE_VERSION__
-    kotlin("jvm") version "1.5.0"
+    kotlin("jvm") version "1.5.10"
    // __LATEST_COMPOSE_RELEASE_VERSION__
-    id("org.jetbrains.compose") version "0.4.0-build209"
+    id("org.jetbrains.compose") version "0.4.0-rc1"
 }

 group = "me.user"
--- a/examples/imageviewer/build.gradle.kts
+++ b/examples/imageviewer/build.gradle.kts
@ -11,10 +11,10 @@ buildscript {

    dependencies {
        // __LATEST_COMPOSE_RELEASE_VERSION__
-        classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build209")
+        classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-rc1")
        classpath("com.android.tools.build:gradle:4.0.1")
        // __KOTLIN_COMPOSE_VERSION__
-        classpath(kotlin("gradle-plugin", version = "1.5.0"))
+        classpath(kotlin("gradle-plugin", version = "1.5.10"))
    }
 }

--- a/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/utils/Application.kt
+++ b/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/utils/Application.kt
@ -6,7 +6,7 @@ import androidx.compose.desktop.WindowEvents
 import androidx.compose.runtime.*
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.IntSize
-import androidx.compose.ui.window.MenuBar
+import androidx.compose.ui.window.v1.MenuBar
 import kotlinx.coroutines.*
 import kotlinx.coroutines.swing.Swing
 import java.awt.image.BufferedImage
--- a/examples/intelliJPlugin/build.gradle.kts
+++ b/examples/intelliJPlugin/build.gradle.kts
@ -3,9 +3,9 @@ import org.jetbrains.compose.compose
 plugins {
    id("org.jetbrains.intellij") version "0.6.5"
    java
-    kotlin("jvm") version "1.5.0"
+    kotlin("jvm") version "1.5.10"
    // __LATEST_COMPOSE_RELEASE_VERSION__
-    id("org.jetbrains.compose") version "0.4.0-build209"
+    id("org.jetbrains.compose") version "0.4.0-rc1"
 }

 group = "org.example"
--- a/examples/issues/build.gradle.kts
+++ b/examples/issues/build.gradle.kts
@ -9,10 +9,10 @@ buildscript {

    dependencies {
        // __LATEST_COMPOSE_RELEASE_VERSION__
-        classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build209")
+        classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-rc1")
        classpath("com.android.tools.build:gradle:4.0.1")
        // __KOTLIN_COMPOSE_VERSION__
-        classpath(kotlin("gradle-plugin", version = "1.5.0"))
+        classpath(kotlin("gradle-plugin", version = "1.5.10"))
    }
 }

--- a/examples/widgetsgallery/build.gradle.kts
+++ b/examples/widgetsgallery/build.gradle.kts
@ -9,10 +9,10 @@ buildscript {

    dependencies {
        // __LATEST_COMPOSE_RELEASE_VERSION__
-        classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build209")
+        classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-rc1")
        classpath("com.android.tools.build:gradle:4.0.1")
        // __KOTLIN_COMPOSE_VERSION__
-        classpath(kotlin("gradle-plugin", version = "1.5.0"))
+        classpath(kotlin("gradle-plugin", version = "1.5.10"))
    }
 }

--- a/gradle-plugins/build.gradle.kts
+++ b/gradle-plugins/build.gradle.kts
@ -2,7 +2,7 @@ import com.gradle.publish.PluginBundleExtension

 plugins {
    // __KOTLIN_COMPOSE_VERSION__
-    kotlin("jvm") version "1.5.0" apply false
+    kotlin("jvm") version "1.5.10" apply false
    id("com.gradle.plugin-publish") version "0.10.1" apply false
    id("de.fuerstenau.buildconfig") version "1.1.8" apply false
 }
--- 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.0"),
+    Default("1.5.10"),
    V1_5_20_dev_3226("1.5.20-dev-3226")
 }
--- 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.4.0-build209
+compose.version=0.4.0-rc1
 compose.with.web=false

 # A version of Gradle plugin, that will be published,
--- a/idea-plugin/build.gradle.kts
+++ b/idea-plugin/build.gradle.kts
@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile

 plugins {
    id("java")
-    id("org.jetbrains.kotlin.jvm") version "1.5.0"
+    id("org.jetbrains.kotlin.jvm") version "1.5.10"
    id("org.jetbrains.intellij") version "0.7.2"
    id("org.jetbrains.changelog") version "1.1.2"
 }
--- a/idea-plugin/examples/desktop-project/build.gradle.kts
+++ b/idea-plugin/examples/desktop-project/build.gradle.kts
@ -2,7 +2,7 @@ import org.jetbrains.compose.compose

 plugins {
    // __KOTLIN_COMPOSE_VERSION__
-    kotlin("jvm") version "1.5.0"
+    kotlin("jvm") version "1.5.10"
    id("org.jetbrains.compose") version "0.4.0-idea-preview-build57"
 }

--- 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.0"
+    kotlin("jvm") version "1.5.10"
    // __LATEST_COMPOSE_RELEASE_VERSION__
-    id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-build209")
+    id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-rc1")
 }

 repositories {
--- 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") ?: "0.4.0-build209"
+    val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-rc1"

    repositories {
        // TODO: remove after new build is published
@ -14,7 +14,7 @@ buildscript {
        classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion")
        classpath("com.android.tools.build:gradle:4.0.1")
        // __KOTLIN_COMPOSE_VERSION__
-        classpath(kotlin("gradle-plugin", version = "1.5.0"))
+        classpath(kotlin("gradle-plugin", version = "1.5.10"))
    }
 }

--- a/tools/replace.sh
+++ b/tools/replace.sh
@ -1,13 +1,13 @@
 #!/bin/bash
 ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/..
-COMPOSE_OLDVER=0.4.0-build208
-COMPOSE_NEWVER=0.4.0-build209
+COMPOSE_OLDVER=0.4.0-build209
+COMPOSE_NEWVER=0.4.0-rc1
 find -E $ROOT  -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$COMPOSE_OLDVER/$COMPOSE_NEWVER/g" {} \;
 APPCOMPAT_OLDVER=1.1.0
 APPCOMPAT_NEWVER=1.3.0-beta01
 find -E $ROOT  -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$APPCOMPAT_OLDVER/$APPCOMPAT_NEWVER/g" {} \;
-KOTLIN_OLDVER=1.4.32
-KOTLIN_NEWVER=1.5.0
+KOTLIN_OLDVER=1.5.0
+KOTLIN_NEWVER=1.5.10
 find -E $ROOT  -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$KOTLIN_OLDVER/$KOTLIN_NEWVER/g" {} \;
 git grep -C 1 __KOTLIN_COMPOSE_VERSION__ $ROOT
 git grep -C 1 __LATEST_COMPOSE_RELEASE_VERSION__ $ROOT
--- a/tutorials/Getting_Started/README.md
+++ b/tutorials/Getting_Started/README.md
@ -35,8 +35,8 @@ packaging JDK 15 or later must be used.
 The Сompose 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. In this example the latest version of the plugin was 0.4.0-build182 and a compatible version of kotlin was 1.4.32. 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.4.32"
-    id("org.jetbrains.compose") version "0.4.0-build182"
+    kotlin("jvm") version "1.5.10"
+    id("org.jetbrains.compose") version "0.4.0-rc1"
 }
 ```