migration onto datetime

0.5.31

.github/workflows/build.yml

@@ -1,12 +0,0 @@
-name: Regular build
-on: [push]
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Build
-        run: ./gradlew build

.github/workflows/dokka_push.yml

@@ -11,6 +11,9 @@ jobs:
       - uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - name: Fix android 31.0.0 dx
+        continue-on-error: true
+        run: cd /usr/local/lib/android/sdk/build-tools/31.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar
       - name: Build
         run: ./gradlew dokkaHtml
       - name: Publish KDocs

.github/workflows/packages_push.yml

@@ -9,6 +9,9 @@ jobs:
       - uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - name: Fix android 31.0.0 dx
+        continue-on-error: true
+        run: cd /usr/local/lib/android/sdk/build-tools/31.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar
       - name: Rewrite version
         run: |
           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
@@ -18,6 +21,7 @@ jobs:
       - name: Build
         run: ./gradlew build
       - name: Publish
+        continue-on-error: true
         run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signAndroidDebugPublication -x signAndroidReleasePublication -x signKotlinMultiplatformPublication
         env:
           GITHUBPACKAGES_USER: ${{ github.actor }}

CHANGELOG.md

@@ -1,5 +1,39 @@
 # 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`:
+    * `Exposed`: `0.34.2` -> `0.35.1`
+
+## 0.5.28
+
+* `Versions`:
+    * `Kotlin`: `1.5.30` -> `1.5.31`
+    * `Klock`: `2.4.1` -> `2.4.2`
+
+## 0.5.27
+
+* `Versions`:
+    * `Exposed`: `0.34.1` -> `0.34.2`
+
 ## 0.5.26
 
 * `Repos`:

gradle.properties

@@ -7,14 +7,14 @@ android.useAndroidX=true
 android.enableJetifier=true
 org.gradle.jvmargs=-Xmx2g
 
-kotlin_version=1.5.30
+kotlin_version=1.5.31
 kotlin_coroutines_version=1.5.2
-kotlin_serialisation_core_version=1.2.2
-kotlin_exposed_version=0.34.1
+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.1
+datetime_version=0.3.0
 
 github_release_plugin_version=2.2.12
 
@@ -27,8 +27,8 @@ androidx_recycler_version=1.2.1
 appcompat_version=1.3.1
 
 android_minSdkVersion=19
-android_compileSdkVersion=30
-android_buildToolsVersion=30.0.3
+android_compileSdkVersion=31
+android_buildToolsVersion=31.0.0
 dexcount_version=3.0.0
 junit_version=4.12
 test_ext_junit_version=1.1.2
@@ -40,10 +40,10 @@ crypto_js_version=4.1.1
 
 # Dokka
 
-dokka_version=1.5.0
+dokka_version=1.5.30
 
 # Project data
 
 group=dev.inmo
-version=0.5.26
-android_code_version=67
+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) }
     )

mppAndroidProject.gradle

@@ -24,3 +24,9 @@ kotlin {
 }
 
 apply from: "$defaultAndroidSettingsPresetPath"
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}

mppJavaProject.gradle

@@ -26,3 +26,9 @@ kotlin {
         }
     }
 }
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}

mppProjectWithSerialization.gradle

@@ -48,3 +48,9 @@ kotlin {
 }
 
 apply from: "$defaultAndroidSettingsPresetPath"
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}