Migrate to 1.2.0-rc01 (#2382)

2026-03-10 08:11:20 +00:00 · 2022-10-10 16:40:04 +02:00
parent 3053e17f80
commit 7ad4492f43
29 changed files with 49 additions and 70 deletions
--- a/ci/compose-uber-jar/gradle.properties
+++ b/ci/compose-uber-jar/gradle.properties
@@ -1,2 +1,2 @@
-compose.version=1.2.0-beta02
+compose.version=1.2.0-rc01
 kotlin.code.style=official
--- 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.7.10
+kotlin.version=1.7.20
 # __LATEST_COMPOSE_RELEASE_VERSION__
-compose.version=1.2.0-beta02
+compose.version=1.2.0-rc01
--- 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.7.10
+kotlin.version=1.7.20
 agp.version=7.1.3
-compose.version=1.2.0-beta02
+compose.version=1.2.0-rc01
--- a/examples/falling-balls/gradle.properties
+++ b/examples/falling-balls/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.7.10
-compose.version=1.2.0-beta02
+kotlin.version=1.7.20
+compose.version=1.2.0-rc01
--- a/examples/imageviewer/common/src/commonMain/kotlin/example/imageviewer/view/Draggable.kt
+++ b/examples/imageviewer/common/src/commonMain/kotlin/example/imageviewer/view/Draggable.kt
@@ -4,7 +4,6 @@ import androidx.compose.foundation.gestures.detectDragGestures
 import androidx.compose.material.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.input.pointer.consumePositionChange
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
@@ -28,7 +27,7 @@ fun Draggable(
            ) { change, dragAmount ->
                dragHandler.drag(dragAmount)
                onUpdate?.invoke()
-                change.consumePositionChange()
+                change.consume()
            }
        }
    ) {
--- a/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/model/DesktopContentState.kt
+++ b/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/model/DesktopContentState.kt
@@ -3,8 +3,8 @@ package example.imageviewer.model
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.window.WindowState
-import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.toComposeImageBitmap
 import example.imageviewer.ResString
 import example.imageviewer.core.FilterType
 import example.imageviewer.model.filtration.FiltersManager
@@ -18,13 +18,9 @@ import example.imageviewer.utils.cropBitmapByScale
 import example.imageviewer.utils.toByteArray
 import java.awt.image.BufferedImage
 import java.io.File
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
 import org.jetbrains.skia.Image

 object ContentState {
@@ -250,7 +246,7 @@ object ContentState {
                    drag
                )
            )
-        ).asImageBitmap()
+        ).toComposeImageBitmap()
    }

    fun swipeNext() {
@@ -358,7 +354,7 @@ private object MainImageWrapper {
    }

    private fun copy(bitmap: BufferedImage) : BufferedImage {
-        var result = BufferedImage(bitmap.width, bitmap.height, bitmap.type)
+        val result = BufferedImage(bitmap.width, bitmap.height, bitmap.type)
        val graphics = result.createGraphics()
        graphics.drawImage(bitmap, 0, 0, result.width, result.height, null)
        return result
--- a/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/view/MainScreen.kt
+++ b/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/view/MainScreen.kt
@@ -16,7 +16,6 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsHoveredAsState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Card
-import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
@@ -24,13 +23,12 @@ import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.toComposeImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import example.imageviewer.ResString
@@ -169,7 +167,7 @@ fun Miniature(
                Image(
                    org.jetbrains.skia.Image.makeFromEncoded(
                        toByteArray(picture.image)
-                    ).asImageBitmap(),
+                    ).toComposeImageBitmap(),
                    contentDescription = null,
                    modifier = Modifier.height(70.dp)
                        .width(90.dp)
--- a/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/view/Toast.kt
+++ b/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/view/Toast.kt
@@ -7,18 +7,13 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import example.imageviewer.style.Foreground
 import example.imageviewer.style.ToastBackground
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch

 enum class ToastDuration(val value: Int) {
    Short(1000), Long(3000)
@@ -53,13 +48,10 @@ fun Toast(
                        color = Foreground
                    )
                }
-                DisposableEffect(Unit) {
-                    GlobalScope.launch {
-                        delay(duration.value.toLong())
-                        isShown = false
-                        visibility.value = false
-                    }
-                    onDispose {  }
+                LaunchedEffect(Unit) {
+                    delay(duration.value.toLong())
+                    isShown = false
+                    visibility.value = false
                }
            }
        }
--- 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.7.10
+kotlin.version=1.7.20
 agp.version=7.1.3
-compose.version=1.2.0-beta02
+compose.version=1.2.0-rc01
--- a/examples/intellij-plugin/gradle.properties
+++ b/examples/intellij-plugin/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.7.10
-compose.version=1.2.0-beta02
+kotlin.version=1.7.20
+compose.version=1.2.0-rc01
--- 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.7.10
+kotlin.version=1.7.20
 agp.version=7.1.3
-compose.version=1.2.0-beta02
+compose.version=1.2.0-rc01
--- 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.7.10
-compose.version=1.2.0-beta02
+kotlin.version=1.7.20
+compose.version=1.2.0-rc01
--- 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.7.10
+kotlin.version=1.7.20
 agp.version=7.1.3
-compose.version=1.2.0-beta02
+compose.version=1.2.0-rc01
--- a/examples/todoapp/common/compose-ui/src/commonMain/kotlin/example/todo/common/ui/TodoEditUi.kt
+++ b/examples/todoapp/common/compose-ui/src/commonMain/kotlin/example/todo/common/ui/TodoEditUi.kt
@@ -46,7 +46,7 @@ fun TodoEditContent(component: TodoEdit) {
            onValueChange = component::onTextChanged
        )

-        Row(modifier = Modifier.padding(8.dp)) {
+        Row(modifier = Modifier.padding(8.dp), verticalAlignment = Alignment.CenterVertically) {
            Text(text = "Completed")

            Spacer(modifier = Modifier.width(8.dp))
--- a/examples/todoapp/desktop/src/jvmMain/kotlin/example/todo/desktop/Main.kt
+++ b/examples/todoapp/desktop/src/jvmMain/kotlin/example/todo/desktop/Main.kt
@@ -1,6 +1,5 @@
 package example.todo.desktop

-import androidx.compose.desktop.DesktopTheme
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
@@ -11,7 +10,6 @@ import androidx.compose.ui.window.rememberWindowState
 import com.arkivanov.decompose.ComponentContext
 import com.arkivanov.decompose.DefaultComponentContext
 import com.arkivanov.decompose.extensions.compose.jetbrains.lifecycle.LifecycleController
-import com.arkivanov.decompose.extensions.compose.jetbrains.rememberRootComponent
 import com.arkivanov.essenty.lifecycle.LifecycleRegistry
 import com.arkivanov.mvikotlin.main.store.DefaultStoreFactory
 import com.badoo.reaktive.coroutinesinterop.asScheduler
@@ -40,9 +38,7 @@ fun main() {
        ) {
            Surface(modifier = Modifier.fillMaxSize()) {
                MaterialTheme {
-                    DesktopTheme {
-                        TodoRootContent(root)
-                    }
+                    TodoRootContent(root)
                }
            }
        }
--- a/examples/todoapp/gradle.properties
+++ b/examples/todoapp/gradle.properties
@@ -22,7 +22,5 @@ kotlin.code.style=official
 org.gradle.parallel=true
 org.gradle.caching=true
 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.7.10
-compose.version=1.2.0-beta02
+compose.version=1.2.0-rc01
--- a/examples/visual-effects/gradle.properties
+++ b/examples/visual-effects/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.7.10
-compose.version=1.2.0-beta02
+kotlin.version=1.7.20
+compose.version=1.2.0-rc01
--- a/examples/web-compose-bird/gradle.properties
+++ b/examples/web-compose-bird/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
 kotlin.version=1.7.10
-compose.version=1.2.0-beta02
+compose.version=1.2.0-rc01
--- a/examples/web-compose-in-js/gradle.properties
+++ b/examples/web-compose-in-js/gradle.properties
@@ -3,4 +3,4 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.native.enableDependencyPropagation=false
 kotlin.js.webpack.major.version=4
 kotlin.version=1.7.10
-compose.version=1.2.0-beta02
+compose.version=1.2.0-rc01
--- a/examples/web-landing/gradle.properties
+++ b/examples/web-landing/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
 kotlin.version=1.7.10
-compose.version=1.2.0-beta02
+compose.version=1.2.0-rc01
--- 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.7.10
-compose.version=1.2.0-beta02
+compose.version=1.2.0-rc01
--- 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.7.10
-compose.version=1.2.0-beta02
+kotlin.version=1.7.20
+compose.version=1.2.0-rc01
 agp.version=7.1.3
--- a/gradle-plugins/gradle.properties
+++ b/gradle-plugins/gradle.properties
@@ -2,7 +2,7 @@ org.gradle.parallel=true
 kotlin.code.style=official

 # Default version of Compose Libraries used by Gradle plugin
-compose.version=1.2.0-beta02
+compose.version=1.2.0-rc01
 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests.
 compose.tests.compiler.version=1.3.2
 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests.
--- 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.7.10
-compose.version=1.2.0-beta02
+kotlin.version=1.7.20
+compose.version=1.2.0-rc01
--- 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.7.10
+kotlin.version=1.7.20
 agp.version=7.1.3
-compose.version=1.2.0-beta02
+compose.version=1.2.0-rc01
--- 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.7.10
-compose.version=1.2.0-beta02
+compose.version=1.2.0-rc01
--- a/tutorials/Getting_Started/README.md
+++ b/tutorials/Getting_Started/README.md
@@ -45,7 +45,7 @@ For the latest versions, see the [latest versions](https://github.com/JetBrains/
 ```
 plugins {
    kotlin("jvm") version "1.6.10"
-    id("org.jetbrains.compose") version "1.2.0-beta02"
+    id("org.jetbrains.compose") version "1.2.0-rc01"
 }
 ```

@@ -81,7 +81,7 @@ import org.jetbrains.compose.compose

 plugins {
    kotlin("jvm") version "1.6.10"
-    id("org.jetbrains.compose") version "1.2.0-beta02"
+    id("org.jetbrains.compose") version "1.2.0-rc01"
 }

 repositories {
--- a/tutorials/Web/Getting_Started/README.md
+++ b/tutorials/Web/Getting_Started/README.md
@@ -39,7 +39,7 @@ pluginManagement {
 // Add compose gradle plugin
 plugins {
    kotlin("multiplatform") version "1.6.10"
-    id("org.jetbrains.compose") version "1.2.0-beta02"
+    id("org.jetbrains.compose") version "1.2.0-rc01"
 }

 // Add maven repositories
--- a/web/gradle.properties
+++ b/web/gradle.properties
@@ -1,4 +1,4 @@
-compose.version=1.2.0-beta02
+compose.version=1.2.0-rc01
 compose.web.buildSamples=false
 compose.web.tests.integration.withFirefox
 compose.web.tests.skip.benchmarks=false