From 555b7886a4a767bbc27163a06d2e2ed12b56bcc6 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 2 Mar 2023 21:28:50 +0600 Subject: [PATCH 1/4] Update gradle.properties --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index b4ae3b0198a..9e210cbe693 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,5 +14,5 @@ crypto_js_version=4.1.1 # Project data group=dev.inmo -version=0.17.1 -android_code_version=183 +version=0.17.2 +android_code_version=184 From 11f0dcfc01428f42483c44a03b464b165bd1a111 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 2 Mar 2023 21:32:58 +0600 Subject: [PATCH 2/4] Update DefaultStatesManager.kt --- .../micro_utils/fsm/common/managers/DefaultStatesManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/managers/DefaultStatesManager.kt b/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/managers/DefaultStatesManager.kt index b6e9556855c..2dda9880bb9 100644 --- a/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/managers/DefaultStatesManager.kt +++ b/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/managers/DefaultStatesManager.kt @@ -49,7 +49,7 @@ interface DefaultStatesManagerRepo { open class DefaultStatesManager( protected val repo: DefaultStatesManagerRepo = InMemoryDefaultStatesManagerRepo(), protected val onStartContextsConflictResolver: suspend (current: T, new: T) -> Boolean = { _, _ -> true }, - protected val onUpdateContextsConflictResolver: suspend (old: T, new: T, currentNew: T) -> Boolean = { _, _, _ -> true } + protected val onUpdateContextsConflictResolver: suspend (old: T, new: T, currentNew: T) -> Boolean = { _, _, _ -> false } ) : StatesManager { protected val _onChainStateUpdated = MutableSharedFlow>(0) override val onChainStateUpdated: Flow> = _onChainStateUpdated.asSharedFlow() From 5f65260bfedeefb7e5f5e9268d254c754013e0e2 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 2 Mar 2023 21:35:59 +0600 Subject: [PATCH 3/4] Update DefaultStatesManager.kt --- .../micro_utils/fsm/common/managers/DefaultStatesManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/managers/DefaultStatesManager.kt b/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/managers/DefaultStatesManager.kt index 2dda9880bb9..cb38a18948b 100644 --- a/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/managers/DefaultStatesManager.kt +++ b/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/managers/DefaultStatesManager.kt @@ -48,7 +48,7 @@ interface DefaultStatesManagerRepo { */ open class DefaultStatesManager( protected val repo: DefaultStatesManagerRepo = InMemoryDefaultStatesManagerRepo(), - protected val onStartContextsConflictResolver: suspend (current: T, new: T) -> Boolean = { _, _ -> true }, + protected val onStartContextsConflictResolver: suspend (current: T, new: T) -> Boolean = { _, _ -> false }, protected val onUpdateContextsConflictResolver: suspend (old: T, new: T, currentNew: T) -> Boolean = { _, _, _ -> false } ) : StatesManager { protected val _onChainStateUpdated = MutableSharedFlow>(0) From 1380d5f8e1ae84a8ded996d6f7584a1dcb2f9b56 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 2 Mar 2023 21:38:20 +0600 Subject: [PATCH 4/4] fill changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index afabfd184f4..6af9dbd7769 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 0.17.2 + +* `FSM`: + * `DefaultStatesManager.onUpdateContextsConflictResolver` and `DefaultStatesManager.onStartContextsConflictResolver` now return `false` by default + ## 0.17.1 * **Hotfix** for absence of jvm dependencies in android modules