Merge pull request #272 from adamint/dev

adamint · web-flow · commit a36ee08e85d0 · 2021-03-31T08:24:25.000-04:00
add ios/tvos targets
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,6 @@
 import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackOutput.Target
 
 plugins {
@@ -169,14 +170,48 @@ kotlin {
             setupPom(artifactId)
         }
     }
+    ios {
+        binaries {
+            framework {
+                baseName = "spotify"
+            }
+        }
+
+        mavenPublication {
+            setupPom(artifactId)
+        }
+    }
+    tvos {
+        binaries {
+            framework {
+                baseName = "spotify"
+            }
+        }
+
+        mavenPublication {
+            setupPom(artifactId)
+        }
+    }
+    // disabled due to lack of coroutine/serialization library support (yet)
+    /*watchos {
+     binaries {
+            framework {
+                baseName = "spotify"
+            }
+        }
+
+        mavenPublication {
+            setupPom(artifactId)
+        }
+    }*/
 
     publishing {
         if ("local" !in (version as String)) registerPublishing()
     }
 
     targets {
         sourceSets {
-            val serializationVersion = "1.0.1"
+            val serializationVersion = "1.1.0"
             val ktorVersion = "1.5.1"
             val korlibsVersion = "2.0.6"
             val sparkVersion = "2.9.3"
@@ -188,7 +223,7 @@ kotlin {
                 dependencies {
                     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion")
                     implementation("io.ktor:ktor-client-core:$ktorVersion")
-                    implementation("com.soywiz.korlibs.klock:klock:$korlibsVersion")
+                    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.1.1")
                     implementation("com.soywiz.korlibs.krypto:krypto:$korlibsVersion")
                     implementation("com.soywiz.korlibs.korim:korim:$korlibsVersion")
 
@@ -313,6 +348,47 @@ kotlin {
                 dependsOn(desktopTest)
             }
 
+            val nativeDarwinMain by creating {
+                dependsOn(commonMain)
+
+                dependencies {
+                    implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineMTVersion") {
+                        version {
+                            strictly(coroutineMTVersion)
+                        }
+                    }
+                    implementation("io.ktor:ktor-client-ios:$ktorVersion")
+                }
+            }
+
+            val nativeDarwinTest by creating {
+                dependsOn(commonTest)
+            }
+
+            val iosMain by getting {
+                dependsOn(nativeDarwinMain)
+            }
+
+            val iosTest by getting {
+                dependsOn(nativeDarwinTest)
+            }
+
+            val tvosMain by getting {
+                dependsOn(nativeDarwinMain)
+            }
+
+            val tvosTest by getting {
+                dependsOn(nativeDarwinTest)
+            }
+
+                /* val watchosMain by getting {
+                dependsOn(nativeDarwinMain)
+            }
+
+            val watchosTest by getting {
+                dependsOn(nativeDarwinTest)
+            }*/
+
             all {
                 languageSettings.useExperimentalAnnotation("kotlin.Experimental")
             }
@@ -452,3 +528,18 @@ fun PublishingExtension.registerPublishing() {
         }
     }
 }
+
+
+val packForXcode by tasks.creating(Sync::class) {
+    group = "build"
+    val mode = System.getenv("CONFIGURATION") ?: "DEBUG"
+    val sdkName = System.getenv("SDK_NAME") ?: "iphonesimulator"
+    val targetName = "ios" + if (sdkName.startsWith("iphoneos")) "Arm64" else "X64"
+    val framework = kotlin.targets.getByName<KotlinNativeTarget>(targetName).binaries.getFramework(mode)
+    inputs.property("mode", mode)
+    dependsOn(framework.linkTask)
+    val targetDir = File(buildDir, "xcode-frameworks")
+    from({ framework.outputDirectory })
+    into(targetDir)
+}
+tasks.getByName("build").dependsOn(packForXcode)
diff --git a/src/androidMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt b/src/androidMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt
@@ -1,22 +1,14 @@
 /* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */
 package com.adamratzman.spotify.utils
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.util.Log
 import android.widget.Toast
 import java.net.URLEncoder
-import java.text.SimpleDateFormat
-import java.util.Date
 
 internal actual fun String.encodeUrl() = URLEncoder.encode(this, "UTF-8")!!
 
-@SuppressLint("SimpleDateFormat")
-internal actual fun formatDate(format: String, date: Long): String {
-    return SimpleDateFormat(format).format(Date(date))
-}
-
 /**
  * Actual platform that this program is run on.
  */
diff --git a/src/commonJvmLikeMain/kotlin/com/adamratzman/spotify/javainterop/SpotifyContinuation.kt b/src/commonJvmLikeMain/kotlin/com/adamratzman/spotify/javainterop/SpotifyContinuation.kt
@@ -11,20 +11,20 @@ import kotlin.coroutines.EmptyCoroutineContext
  * on JVM via traditional continuations. **Please use this class as a callback anytime you are using Java code with this library.**
  *
  */
-abstract class SpotifyContinuation<in T> : Continuation<T> {
+public abstract class SpotifyContinuation<in T> : Continuation<T> {
     /**
      * Invoke a function with the callback [value]
      *
      * @param value The value retrieved from the Spotify API.
      */
-    abstract fun onSuccess(value: T)
+    public abstract fun onSuccess(value: T)
 
     /**
      * Handle exceptions during this API call.
      *
      * @param exception The exception that was thrown during the call.
      */
-    abstract fun onFailure(exception: Throwable)
+    public abstract fun onFailure(exception: Throwable)
 
     override fun resumeWith(result: Result<T>) {
         result.fold(::onSuccess, ::onFailure)
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/BrowseApi.kt b/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("yyyy-MM-dd'T'HH:mm:ss", it) }).toString()
+        ).with("locale", locale).with("timestamp", timestamp?.let { formatDate(it) }).toString()
     ).toObject(FeaturedPlaylists.serializer(), api, json)
 
     /**
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/utils/Utils.kt b/src/commonMain/kotlin/com.adamratzman.spotify/utils/Utils.kt
@@ -3,13 +3,14 @@ package com.adamratzman.spotify.utils
 
 import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.models.ResultEnum
-import com.soywiz.klock.DateTime
+import kotlinx.datetime.Clock
+import kotlinx.datetime.Instant
 import kotlinx.serialization.json.JsonElement
 
 /**
  * The current time in milliseconds since UNIX epoch.
  */
-public fun getCurrentTimeMs(): Long = DateTime.nowUnixLong()
+public fun getCurrentTimeMs(): Long = Clock.System.now().toEpochMilliseconds()
 
 internal fun jsonMap(vararg pairs: Pair<String, JsonElement>) = pairs.toMap().toMutableMap()
 
@@ -26,4 +27,9 @@ 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 expect fun formatDate(format: String, date: Long): String
+/**
+ * Format date to ISO 8601 format
+ */
+internal fun formatDate(date: Long): String {
+    return Instant.fromEpochMilliseconds(date).toString()
+}
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/pub/BrowseApiTest.kt b/src/commonTest/kotlin/com.adamratzman/spotify/pub/BrowseApiTest.kt
@@ -5,6 +5,7 @@ import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.assertFailsWithSuspend
 import com.adamratzman.spotify.buildSpotifyApi
+import com.adamratzman.spotify.clientId
 import com.adamratzman.spotify.endpoints.public.TuneableTrackAttribute
 import com.adamratzman.spotify.runBlockingTest
 import com.adamratzman.spotify.utils.Locale
diff --git a/src/jsMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt b/src/jsMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt
@@ -2,14 +2,9 @@
 package com.adamratzman.spotify.utils
 
 import io.ktor.http.encodeURLQueryComponent
-import kotlin.js.Date
 
 internal actual fun String.encodeUrl() = encodeURLQueryComponent()
 
-internal actual fun formatDate(format: String, date: Long): String {
-    return Date(date).toISOString()
-}
-
 /**
  * Actual platform that this program is run on.
  */
diff --git a/src/jvmMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt b/src/jvmMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt
@@ -2,17 +2,9 @@
 package com.adamratzman.spotify.utils
 
 import java.net.URLEncoder
-import java.text.SimpleDateFormat
-import java.time.Instant
-import java.util.Date
-import java.util.Locale
 
 internal actual fun String.encodeUrl() = URLEncoder.encode(this, "UTF-8")!!
 
-internal actual fun formatDate(format: String, date: Long): String {
-    return SimpleDateFormat(format, Locale.getDefault()).format(Date.from(Instant.ofEpochMilli(date)))
-}
-
 /**
  * The actual platform that this program is running on.
  */
diff --git a/src/linuxX64Main/kotlin/com.adamratzman.spotify.utils/DesktopPlatformUtils.kt b/src/linuxX64Main/kotlin/com.adamratzman.spotify.utils/DesktopPlatformUtils.kt
diff --git a/src/macosX64Main/kotlin/com.adamratzman.spotify.utils/DesktopPlatformUtils.kt b/src/macosX64Main/kotlin/com.adamratzman.spotify.utils/DesktopPlatformUtils.kt
diff --git a/src/mingwX64Main/kotlin/com.adamratzman.spotify.utils/DesktopPlatformUtils.kt b/src/mingwX64Main/kotlin/com.adamratzman.spotify.utils/DesktopPlatformUtils.kt
diff --git a/src/nativeDarwinMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt b/src/nativeDarwinMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt
@@ -0,0 +1,15 @@
+/* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */
+package com.adamratzman.spotify.utils
+
+import io.ktor.http.encodeURLQueryComponent
+
+internal actual fun String.encodeUrl() = encodeURLQueryComponent()
+
+/**
+ * Actual platform that this program is run on.
+ */
+public actual val currentApiPlatform: Platform = Platform.NATIVE
+
+public actual typealias ConcurrentHashMap<K, V> = HashMap<K, V>
+
+public actual fun <K, V> ConcurrentHashMap<K, V>.asList(): List<Pair<K, V>> = toList()
diff --git a/src/nativeDarwinTest/kotlin/com.adamratzman.spotify/CommonImpl.kt b/src/nativeDarwinTest/kotlin/com.adamratzman.spotify/CommonImpl.kt
@@ -0,0 +1,19 @@
+/* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */
+package com.adamratzman.spotify
+
+import kotlin.coroutines.CoroutineContext
+import kotlinx.cinterop.toKString
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.runBlocking
+import platform.posix.getenv
+
+actual fun getEnvironmentVariable(name: String): String? {
+    return getenv(name)?.toKString()
+}
+
+actual fun Exception.stackTrace() = printStackTrace()
+
+actual val testCoroutineContext: CoroutineContext = MainScope().coroutineContext
+actual fun runBlockingTest(block: suspend CoroutineScope.() -> Unit) =
+    runBlocking { this.block() }
