InsanusMokrassar/MicroUtils
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/MicroUtils.git synced 2024-11-18 22:33:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100 from InsanusMokrassar/0.7.0

Browse Source 
0.7.0 + migration back to klock
This commit is contained in:
InsanusMokrassar 2021-10-05 13:51:41 +06:00 committed by GitHub
commit c7a53846ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -2,6 +2,13 @@
## 0.6.0 ## 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** **THIS VERSION HAS MIGRATED FROM KORLIBS KLOCK TO KOTLINX DATETIME. CAREFUL**
**ALL DEPRECATION HAVE BEEN REMOVED** **ALL DEPRECATION HAVE BEEN REMOVED**

6
gradle.properties
View File

@ -14,7 +14,7 @@ kotlin_exposed_version=0.35.1
ktor_version=1.6.4 ktor_version=1.6.4
datetime_version=0.3.0 klockVersion=2.4.3
github_release_plugin_version=2.2.12 github_release_plugin_version=2.2.12
@ -45,5 +45,5 @@ dokka_version=1.5.30
# Project data # Project data
group=dev.inmo group=dev.inmo
version=0.6.0 version=0.7.0
android_code_version=73 android_code_version=74

2
ktor/common/build.gradle
View File

@ -11,7 +11,7 @@ kotlin {
commonMain { commonMain {
dependencies { dependencies {
api "org.jetbrains.kotlinx:kotlinx-serialization-cbor:$kotlin_serialisation_core_version" 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"
} }
} }
} }

12
ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/FromToDateTimeUrl.kt
View File

@ -1,17 +1,17 @@
package dev.inmo.micro_utils.ktor.common 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 val FromToDateTime.asFromToUrlPart: QueryParams
get() = mapOf( get() = mapOf(
"from" to first ?.toEpochMilliseconds() ?.toString(), "from" to first ?.unixMillis ?.toString(),
"to" to second ?.toEpochMilliseconds() ?.toString() "to" to second ?.unixMillis ?.toString()
) )
val QueryParams.extractFromToDateTime: FromToDateTime val QueryParams.extractFromToDateTime: FromToDateTime
get() = FromToDateTime( get() = FromToDateTime(
get("from") ?.run { toLongOrNull() ?: (toDoubleOrNull() ?.toLong()) } ?.let { Instant.fromEpochMilliseconds(it) }, get("from") ?.toDoubleOrNull() ?.let { DateTime(it) },
get("to") ?.run { toLongOrNull() ?: (toDoubleOrNull() ?.toLong()) } ?.let { Instant.fromEpochMilliseconds(it) } get("to") ?.toDoubleOrNull() ?.let { DateTime(it) }
) )

6
ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/FromToDateTimeInUrl.kt
View File

@ -1,11 +1,11 @@
package dev.inmo.micro_utils.ktor.server package dev.inmo.micro_utils.ktor.server
import com.soywiz.klock.DateTime
import dev.inmo.micro_utils.ktor.common.FromToDateTime import dev.inmo.micro_utils.ktor.common.FromToDateTime
import io.ktor.http.Parameters import io.ktor.http.Parameters
import kotlinx.datetime.Instant
val Parameters.extractFromToDateTime: FromToDateTime val Parameters.extractFromToDateTime: FromToDateTime
get() = FromToDateTime( get() = FromToDateTime(
get("from") ?.run { toLongOrNull() ?: (toDoubleOrNull() ?.toLong()) } ?.let { Instant.fromEpochMilliseconds(it) }, get("from") ?.toDoubleOrNull() ?.let { DateTime(it) },
get("to") ?.run { toLongOrNull() ?: (toDoubleOrNull() ?.toLong()) } ?.let { Instant.fromEpochMilliseconds(it) } get("to") ?.toDoubleOrNull() ?.let { DateTime(it) }
) )