change externalurls to have a spotify value, update deps

Author: adamint

build.gradle.kts

@@ -213,16 +213,16 @@ kotlin {
     }
 
     targets {
-        val kotlinxDatetimeVersion = "0.2.1"
+        val kotlinxDatetimeVersion = "0.3.1"
 
         sourceSets {
-            val serializationVersion = "1.2.2"
-            val ktorVersion = "1.6.2"
+            val serializationVersion = "1.3.0"
+            val ktorVersion = "1.6.5"
             val korlibsVersion = "2.2.0"
             val sparkVersion = "2.9.3"
             val androidSpotifyAuthVersion = "1.2.3"
             val androidCryptoVersion = "1.0.0"
-            val coroutineMTVersion = "1.5.1-native-mt"
+            val coroutineMTVersion = "1.5.2-native-mt"
 
             val commonMain by getting {
                 dependencies {

src/commonJvmLikeMain/kotlin/com/adamratzman/spotify/utils/DateTimeUtils.kt

@@ -6,7 +6,7 @@ import kotlinx.datetime.Instant
 /**
  * The current time in milliseconds since UNIX epoch.
  */
-actual fun getCurrentTimeMs(): Long = System.currentTimeMillis()
+public actual fun getCurrentTimeMs(): Long = System.currentTimeMillis()
 
 /**
  * Format date to ISO 8601 format

src/commonMain/kotlin/com.adamratzman.spotify/SpotifyRestAction.kt

@@ -109,7 +109,7 @@ public open class SpotifyRestAction<T> internal constructor(public val supplier:
         consumer: (T) -> Unit
     ) {
         val runAt = getCurrentTimeMs() + timeUnit.toMillis(quantity.toLong())
-        GlobalScope.launch {
+        scope.launch {
             delay(getCurrentTimeMs() - runAt)
 
             try {

src/commonMain/kotlin/com.adamratzman.spotify/models/ResultObjects.kt

@@ -5,6 +5,7 @@ import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.SpotifyApi
 import com.adamratzman.spotify.SpotifyApiOptions
 import com.adamratzman.spotify.SpotifyException
+import com.adamratzman.spotify.utils.ExternalUrls
 import com.adamratzman.spotify.utils.getCurrentTimeMs
 import com.adamratzman.spotify.utils.getExternalUrls
 import kotlinx.serialization.SerialName
@@ -42,7 +43,7 @@ public abstract class CoreObject : Identifiable() {
     protected abstract val externalUrlsString: Map<String, String>
     abstract override val href: String
     public abstract val uri: SpotifyUri
-    public val externalUrls: List<ExternalUrl> get() = getExternalUrls(externalUrlsString)
+    public val externalUrls: ExternalUrls get() = getExternalUrls(externalUrlsString)
 
     public abstract override fun getMembersThatNeedApiInstantiation(): List<NeedsApi?>
 }

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

@@ -2,5 +2,39 @@
 package com.adamratzman.spotify.utils
 
 import com.adamratzman.spotify.models.ExternalUrl
+import kotlinx.serialization.Serializable
 
-public fun getExternalUrls(externalUrlsString: Map<String, String>): List<ExternalUrl> = externalUrlsString.map { ExternalUrl(it.key, it.value) }
+/**
+ * Represents the external urls associated with this Spotify asset.
+ *
+ * @param spotify The associated Spotify link for this asset, if one exists.
+ * @param otherExternalUrls Other external urls, not including [spotify]
+ */
+@Serializable
+public data class ExternalUrls(
+    val spotify: String? = null,
+    val otherExternalUrls: List<ExternalUrl>,
+    private val allExternalUrls: List<ExternalUrl>
+) : List<ExternalUrl> {
+    override val size: Int = allExternalUrls.size
+    override fun contains(element: ExternalUrl): Boolean = allExternalUrls.contains(element)
+    override fun containsAll(elements: Collection<ExternalUrl>): Boolean = allExternalUrls.containsAll(elements)
+    override fun get(index: Int): ExternalUrl = allExternalUrls.get(index)
+    override fun indexOf(element: ExternalUrl): Int = allExternalUrls.indexOf(element)
+    override fun isEmpty(): Boolean = allExternalUrls.isEmpty()
+    override fun iterator(): Iterator<ExternalUrl> = allExternalUrls.iterator()
+    override fun lastIndexOf(element: ExternalUrl): Int = allExternalUrls.lastIndexOf(element)
+    override fun listIterator(): ListIterator<ExternalUrl> = allExternalUrls.listIterator()
+    override fun listIterator(index: Int): ListIterator<ExternalUrl> = allExternalUrls.listIterator(index)
+    override fun subList(fromIndex: Int, toIndex: Int): List<ExternalUrl> = allExternalUrls.subList(fromIndex, toIndex)
+}
+
+public fun getExternalUrls(externalUrlsString: Map<String, String>): ExternalUrls {
+    val externalUrls = externalUrlsString.map { ExternalUrl(it.key, it.value) }
+
+    return ExternalUrls(
+        externalUrlsString["spotify"],
+        externalUrls.filter { it.name != "spotify" },
+        externalUrls
+    )
+}