update serialization and multiplatform dependencies

adamint · adamint · commit 60fbd7a990df · 2020-05-01T00:36:22.000-04:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,8 +7,8 @@ plugins {
     signing
     `java-library`
     id("io.codearte.nexus-staging") version "0.21.2"
-    kotlin("multiplatform") version "1.3.71"
-    kotlin("plugin.serialization") version "1.3.71"
+    kotlin("multiplatform") version "1.3.70"
+    kotlin("plugin.serialization") version "1.3.70"
     id("com.diffplug.gradle.spotless") version "3.26.1"
     id("com.moowork.node") version "1.3.1"
     id("org.jetbrains.dokka") version "0.10.0"
@@ -41,7 +41,7 @@ kotlin {
     targets {
         sourceSets {
             val coroutineVersion = "1.3.3"
-            val serializationVersion = "0.14.0"
+            val serializationVersion = "0.20.0"
             val spekVersion = "2.0.9"
             val ktorVersion = "1.3.0-rc2"
             val kotlinVersion = "1.3.71"
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientFollowingApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientFollowingApi.kt
@@ -17,8 +17,8 @@ import com.adamratzman.spotify.models.PlaylistUri
 import com.adamratzman.spotify.models.UserUri
 import com.adamratzman.spotify.models.serialization.toCursorBasedPagingObject
 import com.adamratzman.spotify.models.serialization.toList
-import kotlinx.serialization.list
-import kotlinx.serialization.serializer
+import kotlinx.serialization.builtins.list
+import kotlinx.serialization.builtins.serializer
 
 @Deprecated("Endpoint name has been updated for kotlin convention consistency", ReplaceWith("ClientFollowingApi"))
 typealias ClientFollowingAPI = ClientFollowingApi
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientLibraryApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientLibraryApi.kt
@@ -17,8 +17,8 @@ import com.adamratzman.spotify.models.TrackUri
 import com.adamratzman.spotify.models.serialization.toList
 import com.adamratzman.spotify.models.serialization.toPagingObject
 import com.adamratzman.spotify.utils.Market
-import kotlinx.serialization.list
-import kotlinx.serialization.serializer
+import kotlinx.serialization.builtins.list
+import kotlinx.serialization.builtins.serializer
 
 @Deprecated("Endpoint name has been updated for kotlin convention consistency", ReplaceWith("ClientLibraryApi"))
 typealias ClientLibraryAPI = ClientLibraryApi
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientPlayerApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientPlayerApi.kt
@@ -27,7 +27,7 @@ import com.adamratzman.spotify.utils.jsonMap
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.json
-import kotlinx.serialization.list
+import kotlinx.serialization.builtins.list
 
 @Deprecated("Endpoint name has been updated for kotlin convention consistency", ReplaceWith("ClientPlayerApi"))
 typealias ClientPlayerAPI = ClientPlayerApi
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/ArtistApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/ArtistApi.kt
@@ -20,7 +20,7 @@ import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.models.serialization.toPagingObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
-import kotlinx.serialization.list
+import kotlinx.serialization.builtins.list
 
 @Deprecated("Endpoint name has been updated for kotlin convention consistency", ReplaceWith("ArtistApi"))
 typealias ArtistsAPI = ArtistApi
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/BrowseApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/BrowseApi.kt
@@ -26,8 +26,8 @@ import com.adamratzman.spotify.utils.Locale
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.formatDate
 import kotlin.reflect.KClass
-import kotlinx.serialization.list
-import kotlinx.serialization.serializer
+import kotlinx.serialization.builtins.list
+import kotlinx.serialization.builtins.serializer
 
 @Deprecated("Endpoint name has been updated for kotlin convention consistency", ReplaceWith("BrowseApi"))
 typealias BrowseAPI = BrowseApi
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/FollowingApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/FollowingApi.kt
@@ -10,8 +10,8 @@ import com.adamratzman.spotify.http.encodeUrl
 import com.adamratzman.spotify.models.PlaylistUri
 import com.adamratzman.spotify.models.UserUri
 import com.adamratzman.spotify.models.serialization.toList
-import kotlinx.serialization.list
-import kotlinx.serialization.serializer
+import kotlinx.serialization.builtins.list
+import kotlinx.serialization.builtins.serializer
 
 @Deprecated("Endpoint name has been updated for kotlin convention consistency", ReplaceWith("FollowingApi"))
 typealias FollowingAPI = FollowingApi
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/PlaylistApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/PlaylistApi.kt
@@ -21,7 +21,7 @@ import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.models.serialization.toPagingObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
-import kotlinx.serialization.list
+import kotlinx.serialization.builtins.list
 
 @Deprecated("Endpoint name has been updated for kotlin convention consistency", ReplaceWith("PlaylistApi"))
 typealias PlaylistAPI = PlaylistApi
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/SearchApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/SearchApi.kt
@@ -21,7 +21,7 @@ import com.adamratzman.spotify.models.serialization.createMapSerializer
 import com.adamratzman.spotify.models.serialization.toPagingObject
 import com.adamratzman.spotify.utils.Market
 import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.serializer
+import kotlinx.serialization.builtins.serializer
 
 @Deprecated("Endpoint name has been updated for kotlin convention consistency", ReplaceWith("SearchApi"))
 typealias SearchAPI = SearchApi
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/models/SpotifyUris.kt b/src/commonMain/kotlin/com.adamratzman.spotify/models/SpotifyUris.kt
@@ -6,9 +6,9 @@ import kotlinx.serialization.Decoder
 import kotlinx.serialization.Encoder
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialDescriptor
-import kotlinx.serialization.Serializable
 import kotlinx.serialization.Serializer
 import kotlinx.serialization.internal.StringDescriptor
+import kotlinx.serialization.Serializable
 
 /**
  * Exception instantiating or deserializing a uri perceived as invalid
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/models/serialization/SerializationUtils.kt b/src/commonMain/kotlin/com.adamratzman.spotify/models/serialization/SerializationUtils.kt
@@ -11,11 +11,11 @@ import com.adamratzman.spotify.models.PagingObject
 import com.adamratzman.spotify.models.instantiatePagingObjects
 import kotlin.reflect.KClass
 import kotlinx.serialization.KSerializer
+import kotlinx.serialization.builtins.MapSerializer
+import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.map
-import kotlinx.serialization.serializer
 
 @Suppress("EXPERIMENTAL_API_USAGE")
 internal val stableJson =
@@ -63,7 +63,9 @@ internal fun <T : Any> String.toPagingObject(
     skipInnerNameFirstIfPossible: Boolean = true
 ): PagingObject<T> {
     if (innerObjectName != null || (arbitraryInnerNameAllowed && !skipInnerNameFirstIfPossible)) {
-        val map = this.parseJson { json.parse((String.serializer() to PagingObject.serializer(tSerializer)).map, this) }
+        val map = this.parseJson {
+            val t = (String.serializer() to PagingObject.serializer(tSerializer))
+            json.parse(MapSerializer(t.first, t.second), this) }
         return (map[innerObjectName] ?: if (arbitraryInnerNameAllowed) map.keys.firstOrNull()?.let { map[it] }
                 ?: error("") else error(""))
                 .apply {
@@ -132,7 +134,9 @@ internal fun <T : Any> String.toCursorBasedPagingObject(
     skipInnerNameFirstIfPossible: Boolean = true
 ): CursorBasedPagingObject<T> {
     if (innerObjectName != null || (arbitraryInnerNameAllowed && !skipInnerNameFirstIfPossible)) {
-        val map = this.parseJson { json.parse((String.serializer() to CursorBasedPagingObject.serializer(tSerializer)).map, this) }
+        val map = this.parseJson {
+            val t = (String.serializer() to CursorBasedPagingObject.serializer(tSerializer))
+            json.parse(MapSerializer(t.first, t.second), this) }
         return (map[innerObjectName] ?: if (arbitraryInnerNameAllowed) map.keys.firstOrNull()?.let { map[it] }
                 ?: error("") else error(""))
                 .apply { initPagingObject(tClazz, this, endpoint) }
@@ -169,19 +173,25 @@ internal inline fun <reified T : Any> String.toCursorBasedPagingObject(
         toCursorBasedPagingObject(T::class, tSerializer, innerObjectName, endpoint, json, arbitraryInnerNameAllowed, skipInnerNameFirstIfPossible)
 
 internal inline fun <reified T> String.toInnerObject(serializer: KSerializer<T>, innerName: String, json: Json): T {
-    val map = this.parseJson { json.parse((String.serializer() to serializer).map, this) }
+    val map = this.parseJson {
+        val t = (String.serializer() to serializer)
+        json.parse(MapSerializer(t.first, t.second), this) }
     return (map[innerName] ?: error("Inner object with name $innerName doesn't exist in $map"))
 }
 
 internal inline fun <reified T> String.toInnerArray(serializer: KSerializer<List<T>>, innerName: String, json: Json): List<T> {
-    val map = this.parseJson { json.parse((String.serializer() to serializer).map, this) }
+    val map = this.parseJson {
+        val t = (String.serializer() to serializer)
+        json.parse(MapSerializer(t.first, t.second), this) }
     return (map[innerName] ?: error("Inner object with name $innerName doesn't exist in $map")).toList()
 }
 
 internal fun Map<String, JsonElement>.toJson() = JsonObject(this).toString()
 
-internal fun <A, B> createMapSerializer(aSerializer: KSerializer<A>, bSerializer: KSerializer<B>) =
-        (aSerializer to bSerializer).map
+internal fun <A, B> createMapSerializer(aSerializer: KSerializer<A>, bSerializer: KSerializer<B>): KSerializer<Map<A, B>> {
+    val t = (aSerializer to bSerializer)
+    return MapSerializer(t.first, t.second)
+}
 
 internal fun <T> String.parseJson(producer: String.() -> T): T =
         try {
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/utilities/JsonTests.kt b/src/commonTest/kotlin/com.adamratzman/spotify/utilities/JsonTests.kt
@@ -12,7 +12,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 import kotlinx.serialization.ImplicitReflectionSerializer
 import kotlinx.serialization.UnstableDefault
-import kotlinx.serialization.internal.nullable
+import kotlinx.serialization.builtins.nullable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.parse
 import org.spekframework.spek2.Spek
