From c1a76e919998cba511408d16a3ab495eb94e4616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernd=20Pr=C3=BCnster?= Date: Tue, 14 Nov 2023 07:38:17 +0100 Subject: [PATCH] add equals and hashCode, version bump --- CHANGELOG.md | 7 ++++++- gradle.properties | 2 +- .../kotlin/at/asitplus/KmmResult.kt | 19 +++++++++++++++---- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 741f98e..a49f91c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,4 +21,9 @@ - Kotlin 1.9.0 ### 1.5.3 -- Kotlin 1.9.10 \ No newline at end of file +- Kotlin 1.9.10 + +### 1.5.4 +- Add `transform()` function to map results without nesting +- Add `mapCatching()` +- Implement `equals()` and `hashCode()` \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 09a2ef5..5276ac4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,4 @@ kotlin.native.binary.freezing=disabled kotlin.mpp.stability.nowarn=true kotlin.native.ignoreDisabledTargets=true -artifactVersion = 1.5.3 \ No newline at end of file +artifactVersion = 1.5.4 \ No newline at end of file diff --git a/src/commonMain/kotlin/at/asitplus/KmmResult.kt b/src/commonMain/kotlin/at/asitplus/KmmResult.kt index a3a9f8e..bbc72b6 100644 --- a/src/commonMain/kotlin/at/asitplus/KmmResult.kt +++ b/src/commonMain/kotlin/at/asitplus/KmmResult.kt @@ -86,14 +86,13 @@ class KmmResult private constructor( getOrNull()?.let { success(block(it)) } ?: this as KmmResult /** - * Transforms this KmmResult into a KmmResult of different success type according to `block` and leaves the failure case untouched - * Avoids nested KmmResults + * Transforms this KmmResult into a KmmResult of different success type according to `block` and leaves the + * failure case untouched. Avoids nested KmmResults */ @Suppress("UNCHECKED_CAST") inline fun transform(block: (T) -> KmmResult): KmmResult = getOrNull()?.let { block(it) } ?: this as KmmResult - /** * Returns the encapsulated result of the given [block] function applied to the encapsulated value * if this instance represents [success][KmmResult.isSuccess] or the @@ -105,7 +104,6 @@ class KmmResult private constructor( @Suppress("UNCHECKED_CAST") inline fun mapCatching(block: (T) -> R): KmmResult = unwrap().mapCatching { block(it) }.wrap() - /** * Transforms this KmmResult's failure-case according to `block` and leaves the success case untouched * (type erasure FTW!) @@ -155,6 +153,19 @@ class KmmResult private constructor( exName?.let { ")" } } + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (other == null || this::class != other::class) return false + + other as KmmResult<*> + + return delegate == other.delegate + } + + override fun hashCode(): Int { + return delegate.hashCode() + } + @OptIn(ExperimentalObjCRefinement::class) companion object { @HiddenFromObjC