From 0fbb92f03f853e1543dbee6b3fb0590f16ef02c1 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 27 Nov 2021 16:20:56 +0600 Subject: [PATCH 1/5] start 0.8.6 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3daac0f5929..0a30423950d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.8.6 + ## 0.8.5 * `Common`: 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 From 249bc83a8c92df0ef8cf3fe85de33bd23e69172d Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 27 Nov 2021 16:22:13 +0600 Subject: [PATCH 2/5] update ktor --- CHANGELOG.md | 3 +++ gradle.properties | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a30423950d..7e20cdb0d13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 0.8.6 +* `Versions`: + * `Ktor`: `1.6.5` -> `1.6.6` + ## 0.8.5 * `Common`: diff --git a/gradle.properties b/gradle.properties index 1a4126017ce..0a660d3788e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ kotlin_coroutines_version=1.5.2 kotlin_serialisation_core_version=1.3.1 kotlin_exposed_version=0.36.2 -ktor_version=1.6.5 +ktor_version=1.6.6 klockVersion=2.4.8 From acf497129807879dc1f9dca19d92b6b92900165c Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 8 Dec 2021 11:36:24 +0600 Subject: [PATCH 3/5] downgrade ktor --- CHANGELOG.md | 3 --- gradle.properties | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e20cdb0d13..0a30423950d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,6 @@ ## 0.8.6 -* `Versions`: - * `Ktor`: `1.6.5` -> `1.6.6` - ## 0.8.5 * `Common`: diff --git a/gradle.properties b/gradle.properties index 0a660d3788e..1a4126017ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ kotlin_coroutines_version=1.5.2 kotlin_serialisation_core_version=1.3.1 kotlin_exposed_version=0.36.2 -ktor_version=1.6.6 +ktor_version=1.6.5 klockVersion=2.4.8 From bdac715d4892b032fa86520cfff6bf559622490b Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 8 Dec 2021 11:41:49 +0600 Subject: [PATCH 4/5] remove crossinline where possible --- .../kotlin/dev/inmo/micro_utils/common/Either.kt | 4 ++-- .../kotlin/dev/inmo/micro_utils/common/JoinTo.kt | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) 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() From bb9669f8fd8e4c7d1a007c308505a7b96ec8c250 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 8 Dec 2021 11:45:01 +0600 Subject: [PATCH 5/5] fill changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a30423950d..ac926cb7010 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 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`: