From 85cd975492d409384c8eb4b0a8b378a05a144aed Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 5 Nov 2021 21:45:01 +0600 Subject: [PATCH] preparations for release --- CHANGELOG.md | 2 ++ ...lerHolder.kt => CheckableHandlerHolder.kt} | 19 ++++++++++++++++--- .../micro_utils/fsm/common/dsl/FSMBuilder.kt | 4 ++-- gradle.properties | 2 +- 4 files changed, 21 insertions(+), 6 deletions(-) rename fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/{StatesHandlerHolder.kt => CheckableHandlerHolder.kt} (78%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3465ef50216..da212d218db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * `Versions`: * `Klock`: `2.4.6` -> `2.4.7` * `Ktor`: `1.6.4` -> `1.6.5` + * `Exposed`: `0.35.3` -> `0.36.1` * `Common`: * Type `Either` got its own serializer * `FSM`: @@ -12,6 +13,7 @@ * Full rework of FSM: * Now it is more flexible for checking of handler opportunity to handle state * Now machine and states managers are type-oriented + * `StateHandlerHolder` has been renamed to `CheckableHandlerHolder` * Add opportunity for comfortable adding default state handler ## 0.7.4 diff --git a/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/StatesHandlerHolder.kt b/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/CheckableHandlerHolder.kt similarity index 78% rename from fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/StatesHandlerHolder.kt rename to fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/CheckableHandlerHolder.kt index 17bc5f9f41e..bdd321b48e0 100644 --- a/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/StatesHandlerHolder.kt +++ b/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/CheckableHandlerHolder.kt @@ -32,7 +32,7 @@ class CustomizableHandlerHolder( } } -fun StateHandlerHolder( +fun CheckableHandlerHolder( inputKlass: KClass, strict: Boolean = false, delegateTo: StatesHandler @@ -47,14 +47,27 @@ fun StateHandlerHolder( } ) +@Deprecated("Renamed", ReplaceWith("CheckableHandlerHolder")) +fun StateHandlerHolder( + inputKlass: KClass, + strict: Boolean = false, + delegateTo: StatesHandler +) = CheckableHandlerHolder(inputKlass, strict, delegateTo) + +inline fun CheckableHandlerHolder( + strict: Boolean = false, + delegateTo: StatesHandler +) = CheckableHandlerHolder(I::class, strict, delegateTo) + +@Deprecated("Renamed", ReplaceWith("CheckableHandlerHolder")) inline fun StateHandlerHolder( strict: Boolean = false, delegateTo: StatesHandler -) = StateHandlerHolder(I::class, strict, delegateTo) +) = CheckableHandlerHolder(strict, delegateTo) inline fun StatesHandler.holder( strict: Boolean = true -) = StateHandlerHolder( +) = CheckableHandlerHolder( I::class, strict, this diff --git a/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/dsl/FSMBuilder.kt b/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/dsl/FSMBuilder.kt index 7b10c1c8362..5713883f3f5 100644 --- a/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/dsl/FSMBuilder.kt +++ b/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/dsl/FSMBuilder.kt @@ -12,7 +12,7 @@ class FSMBuilder( private var states = mutableListOf>() fun add(kClass: KClass, handler: StatesHandler) { - states.add(StateHandlerHolder(kClass, false, handler)) + states.add(CheckableHandlerHolder(kClass, false, handler)) } fun add(filter: suspend (state: State) -> Boolean, handler: StatesHandler) { @@ -20,7 +20,7 @@ class FSMBuilder( } fun addStrict(kClass: KClass, handler: StatesHandler) { - states.add(StateHandlerHolder(kClass, true, handler)) + states.add(CheckableHandlerHolder(kClass, true, handler)) } inline fun onStateOrSubstate(handler: StatesHandler) { diff --git a/gradle.properties b/gradle.properties index b0f7ae31269..0e9d13f86a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx2g kotlin_version=1.5.31 kotlin_coroutines_version=1.5.2 kotlin_serialisation_core_version=1.3.0 -kotlin_exposed_version=0.35.3 +kotlin_exposed_version=0.36.1 ktor_version=1.6.5