From a683cccf0c893aaaf8b26923e2bb097ac5716f6b Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Tue, 5 Oct 2021 13:46:23 +0600
Subject: [PATCH] 0.7.0 + migration back to klock

---
 CHANGELOG.md                                         |  7 +++++++
 gradle.properties                                    |  6 +++---
 ktor/common/build.gradle                             |  2 +-
 .../micro_utils/ktor/common/FromToDateTimeUrl.kt     | 12 ++++++------
 .../micro_utils/ktor/server/FromToDateTimeInUrl.kt   |  6 +++---
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd19b4d0fcd..7f8a197bd6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## 0.6.0
 
+**THIS VERSION HAS MIGRATED FROM KOTLINX DATETIME TO KORLIBS KLOCK. CAREFUL**
+
+* `Versions`
+    * `kotlinx.datetime` -> `Klock`
+
+## 0.6.0 DO NOT RECOMMENDED
+
 **THIS VERSION HAS MIGRATED FROM KORLIBS KLOCK TO KOTLINX DATETIME. CAREFUL**
 **ALL DEPRECATION HAVE BEEN REMOVED**
 
diff --git a/gradle.properties b/gradle.properties
index 99cc3adc782..1278710500a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,7 @@ kotlin_exposed_version=0.35.1
 
 ktor_version=1.6.4
 
-datetime_version=0.3.0
+klockVersion=2.4.3
 
 github_release_plugin_version=2.2.12
 
@@ -45,5 +45,5 @@ dokka_version=1.5.30
 # Project data
 
 group=dev.inmo
-version=0.6.0
-android_code_version=73
+version=0.7.0
+android_code_version=74
diff --git a/ktor/common/build.gradle b/ktor/common/build.gradle
index bed7d491035..64cbbd21ac2 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 "org.jetbrains.kotlinx:kotlinx-datetime:$datetime_version"
+                api "com.soywiz.korlibs.klock:klock:$klockVersion"
             }
         }
     }
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 a83cfee0743..ff015524268 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 kotlinx.datetime.Instant
+import com.soywiz.klock.DateTime
 
-typealias FromToDateTime = Pair<Instant?, Instant?>
+typealias FromToDateTime = Pair<DateTime?, DateTime?>
 
 val FromToDateTime.asFromToUrlPart: QueryParams
     get() = mapOf(
-        "from" to first ?.toEpochMilliseconds() ?.toString(),
-        "to" to second ?.toEpochMilliseconds() ?.toString()
+        "from" to first ?.unixMillis ?.toString(),
+        "to" to second ?.unixMillis ?.toString()
     )
 
 val QueryParams.extractFromToDateTime: FromToDateTime
     get() = FromToDateTime(
-        get("from") ?.run { toLongOrNull() ?: (toDoubleOrNull() ?.toLong()) } ?.let { Instant.fromEpochMilliseconds(it) },
-        get("to") ?.run { toLongOrNull() ?: (toDoubleOrNull() ?.toLong()) } ?.let { Instant.fromEpochMilliseconds(it) }
+        get("from") ?.toDoubleOrNull() ?.let { DateTime(it) },
+        get("to") ?.toDoubleOrNull() ?.let { DateTime(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 045b196d84c..c7e850a9bfd 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") ?.run { toLongOrNull() ?: (toDoubleOrNull() ?.toLong()) } ?.let { Instant.fromEpochMilliseconds(it) },
-        get("to") ?.run { toLongOrNull() ?: (toDoubleOrNull() ?.toLong()) } ?.let { Instant.fromEpochMilliseconds(it) }
+        get("from") ?.toDoubleOrNull() ?.let { DateTime(it) },
+        get("to") ?.toDoubleOrNull() ?.let { DateTime(it) }
     )