From dd33e1e8bc9de2dd156a9a87211f1653fc9dbfa2 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 4 Aug 2022 10:05:29 +0600 Subject: [PATCH] change version of kotlin --- .../kotlin/dev/inmo/micro_utils/common/Optional.kt | 14 +++++++++----- gradle/libs.versions.toml | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Optional.kt b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Optional.kt index 4cb3e2eefd6..ce2d1ecb39e 100644 --- a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Optional.kt +++ b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Optional.kt @@ -52,6 +52,7 @@ inline val T?.optionalOrAbsentIfNull * Will call [block] when data presented ([Optional.dataPresented] == true) */ inline fun Optional.onPresented(block: (T) -> Unit): Optional = apply { + @OptIn(Warning::class) if (dataPresented) { @Suppress("UNCHECKED_CAST") block(data as T) } } @@ -59,6 +60,7 @@ inline fun Optional.onPresented(block: (T) -> Unit): Optional = apply * Will call [block] when data presented ([Optional.dataPresented] == true) */ inline fun Optional.mapOnPresented(block: (T) -> R): R? = run { + @OptIn(Warning::class) if (dataPresented) { @Suppress("UNCHECKED_CAST") block(data as T) } else null } @@ -66,6 +68,7 @@ inline fun Optional.mapOnPresented(block: (T) -> R): R? = run { * Will call [block] when data absent ([Optional.dataPresented] == false) */ inline fun Optional.onAbsent(block: () -> Unit): Optional = apply { + @OptIn(Warning::class) if (!dataPresented) { block() } } @@ -73,27 +76,28 @@ inline fun Optional.onAbsent(block: () -> Unit): Optional = apply { * Will call [block] when data presented ([Optional.dataPresented] == true) */ inline fun Optional.mapOnAbsent(block: () -> R): R? = run { - if (!dataPresented) { @Suppress("UNCHECKED_CAST") block() } else null + @OptIn(Warning::class) + if (!dataPresented) { block() } else null } /** * Returns [Optional.data] if [Optional.dataPresented] of [this] is true, or null otherwise */ -fun Optional.dataOrNull() = if (dataPresented) @Suppress("UNCHECKED_CAST") (data as T) else null +fun Optional.dataOrNull() = @OptIn(Warning::class) if (dataPresented) @Suppress("UNCHECKED_CAST") (data as T) else null /** * Returns [Optional.data] if [Optional.dataPresented] of [this] is true, or throw [throwable] otherwise */ -fun Optional.dataOrThrow(throwable: Throwable) = if (dataPresented) @Suppress("UNCHECKED_CAST") (data as T) else throw throwable +fun Optional.dataOrThrow(throwable: Throwable) = @OptIn(Warning::class) if (dataPresented) @Suppress("UNCHECKED_CAST") (data as T) else throw throwable /** * Returns [Optional.data] if [Optional.dataPresented] of [this] is true, or call [block] and returns the result of it */ -inline fun Optional.dataOrElse(block: () -> T) = if (dataPresented) @Suppress("UNCHECKED_CAST") (data as T) else block() +inline fun Optional.dataOrElse(block: () -> T) = @OptIn(Warning::class) if (dataPresented) @Suppress("UNCHECKED_CAST") (data as T) else block() /** * Returns [Optional.data] if [Optional.dataPresented] of [this] is true, or call [block] and returns the result of it */ @Deprecated("dataOrElse now is inline", ReplaceWith("dataOrElse", "dev.inmo.micro_utils.common.dataOrElse")) -suspend fun Optional.dataOrElseSuspendable(block: suspend () -> T) = if (dataPresented) @Suppress("UNCHECKED_CAST") (data as T) else block() +suspend fun Optional.dataOrElseSuspendable(block: suspend () -> T) = @OptIn(Warning::class) if (dataPresented) @Suppress("UNCHECKED_CAST") (data as T) else block() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0a2e9fc76b5..1039277e96f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -kt = "1.7.10" +kt = "1.7.0" kt-serialization = "1.4.0-RC" kt-coroutines = "1.6.4" jb-compose = "1.2.0-alpha01-dev753" jb-exposed = "0.39.2" -jb-dokka = "1.7.10" +jb-dokka = "1.7.0" klock = "3.0.0" uuid = "0.5.0"