From 5e6483cd1818928d4fbccc408fa9311d69a3b9d2 Mon Sep 17 00:00:00 2001 From: Arkadii Ivanov Date: Mon, 18 Jan 2021 08:22:50 +0000 Subject: [PATCH] Update todoapp Compose to 0.3.0-build140 and Decompose to 0.1.6 (#286) --- examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt | 4 ++-- .../kotlin/example/todo/common/ui/ShortcutHandler.kt | 1 + .../example/todo/common/root/integration/TodoRootImpl.kt | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt index e3382f4f27..84257dfe3b 100644 --- a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt +++ b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt @@ -12,7 +12,7 @@ object Deps { object Compose { // __LATEST_COMPOSE_RELEASE_VERSION__ - private const val VERSION = "0.3.0-build135" + private const val VERSION = "0.3.0-build140" const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION" } } @@ -45,7 +45,7 @@ object Deps { } object Decompose { - private const val VERSION = "0.1.4" + private const val VERSION = "0.1.6" const val decompose = "com.arkivanov.decompose:decompose:$VERSION" const val decomposeIosX64 = "com.arkivanov.decompose:decompose-iosx64:$VERSION" const val decomposeIosArm64 = "com.arkivanov.decompose:decompose-iosarm64:$VERSION" diff --git a/examples/todoapp/common/compose-ui/src/commonMain/kotlin/example/todo/common/ui/ShortcutHandler.kt b/examples/todoapp/common/compose-ui/src/commonMain/kotlin/example/todo/common/ui/ShortcutHandler.kt index 0c62cb0452..6559422d4e 100644 --- a/examples/todoapp/common/compose-ui/src/commonMain/kotlin/example/todo/common/ui/ShortcutHandler.kt +++ b/examples/todoapp/common/compose-ui/src/commonMain/kotlin/example/todo/common/ui/ShortcutHandler.kt @@ -2,6 +2,7 @@ package example.todo.common.ui import androidx.compose.ui.input.key.Key import androidx.compose.ui.input.key.KeyEvent +import androidx.compose.ui.input.key.key fun onKeyUp(key: Key, onEvent: () -> Unit): (KeyEvent) -> Boolean = { keyEvent -> diff --git a/examples/todoapp/common/root/src/commonMain/kotlin/example/todo/common/root/integration/TodoRootImpl.kt b/examples/todoapp/common/root/src/commonMain/kotlin/example/todo/common/root/integration/TodoRootImpl.kt index 6454f5a93d..418ff2af9c 100644 --- a/examples/todoapp/common/root/src/commonMain/kotlin/example/todo/common/root/integration/TodoRootImpl.kt +++ b/examples/todoapp/common/root/src/commonMain/kotlin/example/todo/common/root/integration/TodoRootImpl.kt @@ -2,6 +2,8 @@ package example.todo.common.root.integration import com.arkivanov.decompose.ComponentContext import com.arkivanov.decompose.RouterState +import com.arkivanov.decompose.pop +import com.arkivanov.decompose.push import com.arkivanov.decompose.router import com.arkivanov.decompose.statekeeper.Parcelable import com.arkivanov.decompose.statekeeper.Parcelize