diff --git a/CHANGELOG.md b/CHANGELOG.md index 3daac0f5929..ac926cb7010 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.8.6 + +* `Common`: + * `Either` extensions `onFirst` and `onSecond` now accept not `crossinline` callbacks + * All `joinTo` now accept not `crossinline` callbacks + ## 0.8.5 * `Common`: diff --git a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt index 35a984d7003..135c41672cd 100644 --- a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt +++ b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt @@ -129,7 +129,7 @@ inline fun Either.Companion.second(t2: T2): Either = EitherSeco /** * Will call [block] in case when [Either.t1] of [this] is not null */ -inline fun > E.onFirst(crossinline block: (T1) -> Unit): E { +inline fun > E.onFirst(block: (T1) -> Unit): E { val t1 = t1 t1 ?.let(block) return this @@ -138,7 +138,7 @@ inline fun > E.onFirst(crossinline block: (T1) -> Uni /** * Will call [block] in case when [Either.t2] of [this] is not null */ -inline fun > E.onSecond(crossinline block: (T2) -> Unit): E { +inline fun > E.onSecond(block: (T2) -> Unit): E { val t2 = t2 t2 ?.let(block) return this diff --git a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/JoinTo.kt b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/JoinTo.kt index e6919928160..4506e4c4829 100644 --- a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/JoinTo.kt +++ b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/JoinTo.kt @@ -1,10 +1,10 @@ package dev.inmo.micro_utils.common inline fun Iterable.joinTo( - crossinline separatorFun: (I) -> R?, + separatorFun: (I) -> R?, prefix: R? = null, postfix: R? = null, - crossinline transform: (I) -> R? + transform: (I) -> R? ): List { val result = mutableListOf() val iterator = iterator() @@ -29,11 +29,11 @@ inline fun Iterable.joinTo( separator: R? = null, prefix: R? = null, postfix: R? = null, - crossinline transform: (I) -> R? + transform: (I) -> R? ): List = joinTo({ separator }, prefix, postfix, transform) inline fun Iterable.joinTo( - crossinline separatorFun: (I) -> I?, + separatorFun: (I) -> I?, prefix: I? = null, postfix: I? = null ): List = joinTo(separatorFun, prefix, postfix) { it } @@ -45,15 +45,15 @@ inline fun Iterable.joinTo( ): List = joinTo({ separator }, prefix, postfix) inline fun Array.joinTo( - crossinline separatorFun: (I) -> R?, + separatorFun: (I) -> R?, prefix: R? = null, postfix: R? = null, - crossinline transform: (I) -> R? + transform: (I) -> R? ): Array = asIterable().joinTo(separatorFun, prefix, postfix, transform).toTypedArray() inline fun Array.joinTo( separator: R? = null, prefix: R? = null, postfix: R? = null, - crossinline transform: (I) -> R? + transform: (I) -> R? ): Array = asIterable().joinTo(separator, prefix, postfix, transform).toTypedArray() diff --git a/gradle.properties b/gradle.properties index 22103b0dee3..1a4126017ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -45,5 +45,5 @@ dokka_version=1.5.31 # Project data group=dev.inmo -version=0.8.5 -android_code_version=85 +version=0.8.6 +android_code_version=86