remove kotlinx-datetime dependency

Signed-off-by: Adam Ratzman <[email protected]>

Author: adamint

build.gradle.kts

@@ -214,14 +214,13 @@ kotlin {
             val coroutineVersion = "1.4.2-native-mt"
             val serializationVersion = "1.0.1"
             val ktorVersion = "1.5.0"
-            val kotlinxDatetimeVersion = "0.1.1"
+            val klockVersion = "2.0.3"
 
             val commonMain by getting {
                 dependencies {
                     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
                     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion")
                     implementation("io.ktor:ktor-client-core:$ktorVersion")
-                    implementation("org.jetbrains.kotlinx:kotlinx-datetime:$kotlinxDatetimeVersion")
                 }
             }
 
@@ -291,6 +290,7 @@ kotlin {
                 dependsOn(commonMain)
 
                 dependencies {
+                    implementation("com.soywiz.korlibs.klock:klock:$klockVersion")
                     implementation("io.ktor:ktor-client-curl:$ktorVersion")
                 }
             }
@@ -303,6 +303,10 @@ kotlin {
 
             val linuxX64Main by getting {
                 dependsOn(desktopMain)
+
+                dependencies {
+                    implementation("com.soywiz.korlibs.klock:klock-linuxx64:$klockVersion")
+                }
             }
 
             val linuxX64Test by getting {
@@ -311,6 +315,10 @@ kotlin {
 
             val mingwX64Main by getting {
                 dependsOn(desktopMain)
+
+                dependencies {
+                    implementation("com.soywiz.korlibs.klock:klock-mingwx64:$klockVersion")
+                }
             }
 
             val mingwX64Test by getting {
@@ -319,6 +327,10 @@ kotlin {
 
             val macosX64Main by getting {
                 dependsOn(desktopMain)
+
+                dependencies {
+                    implementation("com.soywiz.korlibs.klock:klock-macosx64:$klockVersion")
+                }
             }
 
             val macosX64Test by getting {

src/androidMain/kotlin/com/adamratzman/spotify/utils/Misc.kt

@@ -1,7 +1,16 @@
 /* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */
 package com.adamratzman.spotify.utils
 
+import android.annotation.SuppressLint
+import java.text.SimpleDateFormat
+import java.util.Date
+
 /**
  * The current time in milliseconds since UNIX epoch.
  */
 public actual fun getCurrentTimeMs(): Long = System.currentTimeMillis()
+
+@SuppressLint("SimpleDateFormat")
+internal actual fun formatDate(format: String, date: Long): String {
+    return SimpleDateFormat(format).format(Date(date))
+}

src/androidMain/kotlin/com/adamratzman/spotify/utils/Platform.kt

@@ -4,4 +4,4 @@ package com.adamratzman.spotify.utils
 /**
  * Actual platform that this program is run on.
  */
-public actual val platform: Platform = Platform.ANDROID
+public actual val currentApiPlatform: Platform = Platform.ANDROID

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/BrowseApi.kt

@@ -101,7 +101,7 @@ public class BrowseApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         endpointBuilder("/browse/featured-playlists").with("limit", limit).with("offset", offset).with(
             "market",
             market?.name
-        ).with("locale", locale).with("timestamp", timestamp?.let { formatDate(it) }).toString()
+        ).with("locale", locale).with("timestamp", timestamp?.let { formatDate("yyyy-MM-dd'T'HH:mm:ss", it) }).toString()
     ).toObject(FeaturedPlaylists.serializer(), api, json)
 
     /**

src/commonMain/kotlin/com.adamratzman.spotify/utils/Platform.kt

@@ -11,4 +11,4 @@ public enum class Platform {
     NATIVE
 }
 
-public expect val platform: Platform
+public expect val currentApiPlatform: Platform

src/commonMain/kotlin/com.adamratzman.spotify/utils/Utils.kt

@@ -3,9 +3,6 @@ package com.adamratzman.spotify.utils
 
 import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.models.ResultEnum
-import kotlinx.datetime.Instant
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
 import kotlinx.serialization.json.JsonElement
 
 /**
@@ -28,5 +25,4 @@ internal suspend inline fun <T> catch(crossinline function: suspend () -> T): T?
 internal fun <T : ResultEnum> Array<T>.match(identifier: String) =
     firstOrNull { it.retrieveIdentifier().toString().equals(identifier, true) }
 
-internal fun formatDate(date: Long): String =
-    Instant.fromEpochMilliseconds(date).toLocalDateTime(TimeZone.currentSystemDefault()).toString()
+internal expect fun formatDate(format: String, date: Long): String

src/commonTest/kotlin/com.adamratzman/spotify/priv/ClientPlaylistApiTest.kt

@@ -10,7 +10,7 @@ import com.adamratzman.spotify.models.Playlist
 import com.adamratzman.spotify.models.SimplePlaylist
 import com.adamratzman.spotify.runBlockingTest
 import com.adamratzman.spotify.utils.Platform
-import com.adamratzman.spotify.utils.platform
+import com.adamratzman.spotify.utils.currentApiPlatform
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -99,7 +99,7 @@ class ClientPlaylistApiTest {
 
     @Test
     fun testEditPlaylists() {
-        if (platform != Platform.NATIVE) {
+        if (currentApiPlatform != Platform.NATIVE) {
             runBlockingTest {
                 if (!testPrereq()) return@runBlockingTest
 
@@ -114,7 +114,7 @@ class ClientPlaylistApiTest {
                     "7FjZU7XFs7P9jHI9Z0yRhK"
                 )
 
-                if (platform !in listOf(Platform.ANDROID, Platform.NATIVE)) {
+                if (currentApiPlatform !in listOf(Platform.ANDROID, Platform.NATIVE)) {
                     api.playlists.uploadClientPlaylistCover(
                         createdPlaylist.id,
                         imageUrl = "https://developer.spotify.com/assets/WebAPI_intro.png"
@@ -150,7 +150,7 @@ class ClientPlaylistApiTest {
 
     @Test
     fun testRemovePlaylistTracks() {
-        if (platform != Platform.NATIVE) {
+        if (currentApiPlatform != Platform.NATIVE) {
             runBlockingTest {
                 if (!testPrereq()) return@runBlockingTest
 

src/desktopMain/kotlin/com/adamratzman/spotify/utils/Misc.kt

@@ -1,6 +1,7 @@
 /* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */
 package com.adamratzman.spotify.utils
 
+import com.soywiz.klock.DateTime
 import kotlin.system.getTimeMillis
 
 /**
@@ -9,3 +10,7 @@ import kotlin.system.getTimeMillis
 public actual fun getCurrentTimeMs(): Long {
     return getTimeMillis()
 }
+
+internal actual fun formatDate(format: String, date: Long): String {
+    return DateTime.now().toString("yyyy-MM-dd'T'HH:mm:ss")
+}

src/desktopMain/kotlin/com/adamratzman/spotify/utils/Platform.kt

@@ -4,4 +4,4 @@ package com.adamratzman.spotify.utils
 /**
  * Actual platform that this program is run on.
  */
-public actual val platform: Platform = Platform.NATIVE
+public actual val currentApiPlatform: Platform = Platform.NATIVE

src/desktopTest/kotlin/com.adamratzman.spotify/CommonImpl.kt

@@ -2,7 +2,6 @@
 package com.adamratzman.spotify
 
 import kotlin.coroutines.CoroutineContext
-import kotlinx.cinterop.toKString
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.runBlocking