diff --git a/CHANGELOG.md b/CHANGELOG.md index 56c34c5a7da..46d40335218 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## 0.6.0 +**THIS VERSION HAS MIGRATED FROM KORLIBS KLOCK TO KOTLINX DATETIME. CAREFUL** + +* `Versions` + * `Klock` -> `kotlinx.datetime` + ## 0.5.31 * `Versions`: diff --git a/gradle.properties b/gradle.properties index a952987e2ec..99cc3adc782 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ kotlin_exposed_version=0.35.1 ktor_version=1.6.4 -klockVersion=2.4.3 +datetime_version=0.3.0 github_release_plugin_version=2.2.12 diff --git a/ktor/common/build.gradle b/ktor/common/build.gradle index 64cbbd21ac2..bed7d491035 100644 --- a/ktor/common/build.gradle +++ b/ktor/common/build.gradle @@ -11,7 +11,7 @@ kotlin { commonMain { dependencies { api "org.jetbrains.kotlinx:kotlinx-serialization-cbor:$kotlin_serialisation_core_version" - api "com.soywiz.korlibs.klock:klock:$klockVersion" + api "org.jetbrains.kotlinx:kotlinx-datetime:$datetime_version" } } } diff --git a/ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/FromToDateTimeUrl.kt b/ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/FromToDateTimeUrl.kt index ff015524268..a83cfee0743 100644 --- a/ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/FromToDateTimeUrl.kt +++ b/ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/FromToDateTimeUrl.kt @@ -1,17 +1,17 @@ package dev.inmo.micro_utils.ktor.common -import com.soywiz.klock.DateTime +import kotlinx.datetime.Instant -typealias FromToDateTime = Pair +typealias FromToDateTime = Pair val FromToDateTime.asFromToUrlPart: QueryParams get() = mapOf( - "from" to first ?.unixMillis ?.toString(), - "to" to second ?.unixMillis ?.toString() + "from" to first ?.toEpochMilliseconds() ?.toString(), + "to" to second ?.toEpochMilliseconds() ?.toString() ) val QueryParams.extractFromToDateTime: FromToDateTime get() = FromToDateTime( - get("from") ?.toDoubleOrNull() ?.let { DateTime(it) }, - get("to") ?.toDoubleOrNull() ?.let { DateTime(it) } + get("from") ?.run { toLongOrNull() ?: (toDoubleOrNull() ?.toLong()) } ?.let { Instant.fromEpochMilliseconds(it) }, + get("to") ?.run { toLongOrNull() ?: (toDoubleOrNull() ?.toLong()) } ?.let { Instant.fromEpochMilliseconds(it) } ) diff --git a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/FromToDateTimeInUrl.kt b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/FromToDateTimeInUrl.kt index c7e850a9bfd..045b196d84c 100644 --- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/FromToDateTimeInUrl.kt +++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/FromToDateTimeInUrl.kt @@ -1,11 +1,11 @@ package dev.inmo.micro_utils.ktor.server -import com.soywiz.klock.DateTime import dev.inmo.micro_utils.ktor.common.FromToDateTime import io.ktor.http.Parameters +import kotlinx.datetime.Instant val Parameters.extractFromToDateTime: FromToDateTime get() = FromToDateTime( - get("from") ?.toDoubleOrNull() ?.let { DateTime(it) }, - get("to") ?.toDoubleOrNull() ?.let { DateTime(it) } + get("from") ?.run { toLongOrNull() ?: (toDoubleOrNull() ?.toLong()) } ?.let { Instant.fromEpochMilliseconds(it) }, + get("to") ?.run { toLongOrNull() ?: (toDoubleOrNull() ?.toLong()) } ?.let { Instant.fromEpochMilliseconds(it) } )