Migrated to kotlinx.datetime

README.md

@@ -18,6 +18,7 @@ Example:
 
 ```
 ktorVersion=2.3.6
+dateTimeVersion=0.6.0-RC.2
 logbackVersion=1.5.1
 tursoSdkVersion=0.1.11 // currently published version
 ```
@@ -29,6 +30,7 @@ Add dependencies to `build.gradle.kts`
 ```Kotlin
 // define version variables
 val ktorVersion: String by project
+val dateTimeVersion: String by project
 val logbackVersion: String by project
 val tursoSdkVersion: String by project
 
@@ -44,6 +46,7 @@ dependencies {
     implementation("io.ktor:ktor-client-cio:$ktorVersion")
     implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
+    implementation("org.jetbrains.kotlinx:kotlinx-datetime-jvm:$dateTimeVersion")
     implementation ("ch.qos.logback:logback-classic:$logbackVersion")
     implementation("com.jeliuc:turso-sdk-jvm:$tursoSdkVersion")
     // ...
@@ -99,7 +102,7 @@ client.close()
 
 ## Future Plans
 
-* [ ] Use `kotlinx.datetime` for date and time handling
+* [x] Use `kotlinx.datetime` for date and time handling
 * [ ] Transform into a multiplatform library (KMP) - and support JVM, JS, and Native
 * [ ] HRANA3 protocol implementation (WIP)
 * [ ] libSQL JDBC driver (WIP)

build.gradle.kts

@@ -6,13 +6,14 @@ import org.jetbrains.dokka.versioning.VersioningConfiguration
 import org.jetbrains.dokka.versioning.VersioningPlugin
 
 val ktorVersion: String by project
+val dateTimeVersion: String by project
 
 val spaceUsername: String? by project
 val spacePassword: String? by project
-val sdkVersion: String by project
 val spaceMavenRepositoryUrl: String by project
 val sonatypeUsername: String by project
 val sonatypePassword: String by project
+val sdkVersion: String by project
 
 group = "com.jeliuc"
 version = System.getenv("SDK_VERSION") ?: sdkVersion
@@ -48,6 +49,7 @@ dependencies {
     implementation("io.ktor:ktor-client-cio:$ktorVersion")
     implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
+    implementation("org.jetbrains.kotlinx:kotlinx-datetime-jvm:$dateTimeVersion")
 }
 
 tasks.test {

gradle.properties

@@ -1,5 +1,6 @@
 kotlin.code.style=official
 ktorVersion=2.3.6
+dateTimeVersion=0.6.0-RC.2
 sdkVersion=0.1.11
 spaceUsername=
 spacePassword=

src/main/kotlin/model/AuditLog.kt

@@ -5,11 +5,10 @@
 
 package com.jeliuc.turso.sdk.model
 
-import com.jeliuc.turso.sdk.serializer.LocalDateTimeSerializer
+import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonElement
-import java.time.LocalDateTime
 
 @Serializable
 data class ListAuditLogsResponse(
@@ -21,7 +20,7 @@ data class ListAuditLogsResponse(
 data class AuditLog(
     @SerialName("author") val author: String,
     @SerialName("code") val code: String,
-    @SerialName("created_at") @Serializable(with = LocalDateTimeSerializer::class) val createdAt: LocalDateTime,
+    @SerialName("created_at") val createdAt: Instant,
     @SerialName("data") val data: JsonElement,
     @SerialName("message") val message: String,
     @SerialName("origin") val origin: String,

src/main/kotlin/model/Organization.kt

@@ -5,10 +5,9 @@
 
 package com.jeliuc.turso.sdk.model
 
-import com.jeliuc.turso.sdk.serializer.LocalDateTimeSerializer
+import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import java.time.LocalDateTime
 
 @Serializable
 data class Organization(
@@ -94,15 +93,15 @@ data class ListInvitesResponse(
 @Serializable
 data class Invite(
     @SerialName("Accepted") val accepted: Boolean,
-    @SerialName("CreatedAt") @Serializable(with = LocalDateTimeSerializer::class) val createdAt: LocalDateTime,
-    @SerialName("DeletedAt") @Serializable(with = LocalDateTimeSerializer::class) val deletedAt: LocalDateTime,
+    @SerialName("CreatedAt") val createdAt: Instant,
+    @SerialName("DeletedAt") val deletedAt: Instant,
     @SerialName("Email") val email: String,
     @SerialName("ID") val id: Int,
     @SerialName("Organization") val organization: Organization,
     @SerialName("OrganizationID") val organizationID: Int,
     @SerialName("Role") val role: MemberRole,
     @SerialName("Token") val token: String,
-    @SerialName("UpdatedAt") @Serializable(with = LocalDateTimeSerializer::class) val updatedAt: LocalDateTime,
+    @SerialName("UpdatedAt") val updatedAt: Instant,
 )
 
 @Serializable

src/main/kotlin/resource/Databases.kt

@@ -29,8 +29,8 @@ import io.ktor.http.ContentType
 import io.ktor.http.Headers
 import io.ktor.http.HttpHeaders
 import io.ktor.http.contentType
+import kotlinx.datetime.LocalDateTime
 import java.io.File
-import java.time.LocalDateTime
 
 val TursoClient.databases: Databases
     get() = Databases(this)