migration onto datetime

0.5.31

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.6.0
+
+**THIS VERSION HAS MIGRATED FROM KORLIBS KLOCK TO KOTLINX DATETIME. CAREFUL**
+
+* `Versions`
+    * `Klock` -> `kotlinx.datetime`
+
+## 0.5.31
+
+* `Versions`:
+    * `Klock`: `2.4.2` -> `2.4.3`
+    * `Ktor`: `1.6.3` -> `1.6.4`
+
+## 0.5.30
+
+* `Versions`:
+    * `Serialization`: `1.2.2` -> `1.3.0`
+
 ## 0.5.29
 
 * `Versions`:

gradle.properties

@@ -9,12 +9,12 @@ org.gradle.jvmargs=-Xmx2g
 
 kotlin_version=1.5.31
 kotlin_coroutines_version=1.5.2
-kotlin_serialisation_core_version=1.2.2
+kotlin_serialisation_core_version=1.3.0
 kotlin_exposed_version=0.35.1
 
-ktor_version=1.6.3
+ktor_version=1.6.4
 
-klockVersion=2.4.2
+datetime_version=0.3.0
 
 github_release_plugin_version=2.2.12
 
@@ -45,5 +45,5 @@ dokka_version=1.5.30
 # Project data
 
 group=dev.inmo
-version=0.5.29
-android_code_version=70
+version=0.6.0
+android_code_version=73

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"
             }
         }
     }

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<DateTime?, DateTime?>
+typealias FromToDateTime = Pair<Instant?, Instant?>
 
 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) }
     )

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) }
     )