From e6ec9d8c309f986538a456d06a62a3e5f9ee0498 Mon Sep 17 00:00:00 2001 From: andreykovalev Date: Mon, 27 Mar 2023 09:38:17 +0100 Subject: [PATCH 1/2] Remove deprecated methods --- .../core/navigation/transition/CombinedHandler.kt | 12 ------------ .../main/kotlin/com/bumble/appyx/core/node/Node.kt | 8 -------- .../kotlin/com/bumble/appyx/core/node/ParentNode.kt | 9 --------- 3 files changed, 29 deletions(-) diff --git a/libraries/core/src/main/kotlin/com/bumble/appyx/core/navigation/transition/CombinedHandler.kt b/libraries/core/src/main/kotlin/com/bumble/appyx/core/navigation/transition/CombinedHandler.kt index f11c5af6d..febaeedcd 100644 --- a/libraries/core/src/main/kotlin/com/bumble/appyx/core/navigation/transition/CombinedHandler.kt +++ b/libraries/core/src/main/kotlin/com/bumble/appyx/core/navigation/transition/CombinedHandler.kt @@ -24,18 +24,6 @@ class CombinedHandler( } } -@Suppress("UnstableCollections") -@Deprecated( - message = "Use rememberCombinedHandler with immutable handlers instead. This function will be removed in 1.1", - replaceWith = ReplaceWith( - "rememberCombinedHandler(handlers.toImmutableList())", - "com.bumble.appyx.core.collections.toImmutableList", - ) -) -@Composable -fun rememberCombinedHandler(handlers: List>): ModifierTransitionHandler = - remember { CombinedHandler(handlers = handlers) } - @Composable fun rememberCombinedHandler( handlers: ImmutableList> diff --git a/libraries/core/src/main/kotlin/com/bumble/appyx/core/node/Node.kt b/libraries/core/src/main/kotlin/com/bumble/appyx/core/node/Node.kt index 63104881e..2ffcceef7 100644 --- a/libraries/core/src/main/kotlin/com/bumble/appyx/core/node/Node.kt +++ b/libraries/core/src/main/kotlin/com/bumble/appyx/core/node/Node.kt @@ -101,14 +101,6 @@ open class Node @VisibleForTesting internal constructor( }) } - @Deprecated( - replaceWith = ReplaceWith("executeAction(action)"), - message = "Will be removed in 1.1" - ) - protected suspend inline fun executeWorkflow( - crossinline action: () -> Unit - ): T = executeAction(action) - protected suspend inline fun executeAction( crossinline action: () -> Unit ): T = withContext(lifecycleScope.coroutineContext) { diff --git a/libraries/core/src/main/kotlin/com/bumble/appyx/core/node/ParentNode.kt b/libraries/core/src/main/kotlin/com/bumble/appyx/core/node/ParentNode.kt index fc0b4516f..2ae5b270d 100644 --- a/libraries/core/src/main/kotlin/com/bumble/appyx/core/node/ParentNode.kt +++ b/libraries/core/src/main/kotlin/com/bumble/appyx/core/node/ParentNode.kt @@ -169,15 +169,6 @@ abstract class ParentNode( } } - @Deprecated( - replaceWith = ReplaceWith("attachChild(action"), - message = "Will be removed in 1.1" - ) - protected suspend inline fun attachWorkflow( - timeout: Long = ATTACH_WORKFLOW_SYNC_TIMEOUT, - crossinline action: () -> Unit - ) = attachChild(timeout, action) - /** * attachChild executes provided action e.g. backstack.push(NodeANavTarget) and waits for the specific * Node of type T to appear in the ParentNode's children list. It should happen almost immediately because it happens From 565b99930b967d6a9428295c9f9c955efbb328e4 Mon Sep 17 00:00:00 2001 From: andreykovalev Date: Mon, 27 Mar 2023 09:44:23 +0100 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2487a23e..bd87deb83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Pending changes +- [#383](https://github.com/bumble-tech/appyx/pull/383) – **Changed**: Removed deprecated methods in Node, ParentNode and CombinedHandler classes - [#376](https://github.com/bumble-tech/appyx/issues/376) – **Changed**: Androidx lifecycle version updated to 2.6.1. - [#376](https://github.com/bumble-tech/appyx/issues/376) – **Updated**: Kotlin and Compose compiler version updated to 1.8.10 to align kotlin version used in androidx lifecycle - [#375](https://github.com/bumble-tech/appyx/issues/375) – **Fixed**: SaveableStateHolder does no longer save state for destroyed elements