fixing breaking changes from kotlin-serialization 0.20.0

nbransby · nbransby · commit 066e47885f9e · 2020-03-15T20:33:00.000Z
diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
     google()
 }
 
-version = "0.1.0-dev"
+version = "0.1.0-beta"
 
 android {
     compileSdkVersion(property("targetSdkVersion") as Int)
diff --git a/firebase-app/package.json b/firebase-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@teamhubapp/firebase-app",
-  "version": "0.1.0-dev12",
+  "version": "0.1.0-beta",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-app.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/TeamHubApp/firebase-kotlin-multiplatform-sdk",
   "dependencies": {
-    "@teamhubapp/firebase-common": "0.1.0-dev12",
+    "@teamhubapp/firebase-common": "0.1.0-beta",
     "firebase": "6.2.3",
     "kotlin": "1.3.70",
     "kotlinx-coroutines-core": "1.3.4"
diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     `maven-publish`
 }
 
-version = "0.1.0-dev"
+version = "0.1.0-beta"
 
 android {
     compileSdkVersion(property("targetSdkVersion") as Int)
diff --git a/firebase-auth/package.json b/firebase-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@teamhubapp/firebase-auth",
-  "version": "0.1.0-dev12",
+  "version": "0.1.0-beta",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-auth.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/TeamHubApp/firebase-kotlin-multiplatform-sdk",
   "dependencies": {
-    "@teamhubapp/firebase-app": "0.1.0-dev12",
+    "@teamhubapp/firebase-app": "0.1.0-beta",
     "firebase": "6.2.3",
     "kotlin": "1.3.70",
     "kotlinx-coroutines-core": "1.3.4"
diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
     mavenCentral()
     google()
 }
-version = "0.1.0-dev"
+version = "0.1.0-beta"
 
 android {
     compileSdkVersion(property("targetSdkVersion") as Int)
diff --git a/firebase-common/package.json b/firebase-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@teamhubapp/firebase-common",
-  "version": "0.1.0-dev14",
+  "version": "0.1.0-beta14",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-common.js",
   "scripts": {
diff --git a/firebase-common/src/androidMain/kotlin/dev/teamhub/firebase/_decoders.kt b/firebase-common/src/androidMain/kotlin/dev/teamhub/firebase/_decoders.kt
@@ -6,7 +6,7 @@ import kotlinx.serialization.SerialDescriptor
 import kotlinx.serialization.StructureKind
 
 actual fun FirebaseDecoder.structureDecoder(desc: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeDecoder = when(desc.kind as StructureKind) {
-        StructureKind.CLASS -> (value as Map<*, *>).let { map ->
+        StructureKind.CLASS, StructureKind.OBJECT -> (value as Map<*, *>).let { map ->
             FirebaseClassDecoder(map.size, { map.containsKey(it) }) { desc, index -> map[desc.getElementName(index)] }
         }
         StructureKind.LIST -> (value as List<*>).let {
diff --git a/firebase-common/src/androidMain/kotlin/dev/teamhub/firebase/_encoders.kt b/firebase-common/src/androidMain/kotlin/dev/teamhub/firebase/_encoders.kt
@@ -10,7 +10,7 @@ actual fun FirebaseEncoder.structureEncoder(desc: SerialDescriptor, vararg typeP
     StructureKind.LIST -> mutableListOf<Any?>()
         .also { value = it }
         .let { FirebaseCompositeEncoder(positiveInfinity) { _, index, value -> it.add(index, value) } }
-    StructureKind.MAP,  StructureKind.CLASS -> mutableMapOf<Any?, Any?>()
+    StructureKind.MAP,  StructureKind.CLASS,  StructureKind.OBJECT -> mutableMapOf<Any?, Any?>()
         .also { value = it }
         .let { FirebaseCompositeEncoder(positiveInfinity) { _, index, value -> it[desc.getElementName(index)] = value } }
 }
diff --git a/firebase-common/src/commonMain/kotlin/dev/teamhub/firebase/decoders.kt b/firebase-common/src/commonMain/kotlin/dev/teamhub/firebase/decoders.kt
@@ -3,8 +3,8 @@ package dev.teamhub.firebase
 import kotlinx.serialization.*
 import kotlinx.serialization.CompositeDecoder.Companion.READ_ALL
 import kotlinx.serialization.CompositeDecoder.Companion.READ_DONE
+import kotlinx.serialization.builtins.nullable
 import kotlinx.serialization.internal.UnitDescriptor
-import kotlinx.serialization.internal.nullable
 import kotlinx.serialization.modules.EmptyModule
 import kotlinx.serialization.modules.SerialModule
 import kotlinx.serialization.modules.getContextualOrDefault
@@ -118,6 +118,8 @@ open class FirebaseCompositeDecoder constructor(
 
     override fun decodeUnitElement(desc: SerialDescriptor, index: Int) = decodeUnit(get(desc, index))
 
+    override fun endStructure(descriptor: SerialDescriptor) {
+    }
 }
 
 private fun decodeString(value: Any?) = value.toString()
diff --git a/firebase-common/src/commonMain/kotlin/dev/teamhub/firebase/encoders.kt b/firebase-common/src/commonMain/kotlin/dev/teamhub/firebase/encoders.kt
@@ -1,8 +1,6 @@
 package dev.teamhub.firebase
 
 import kotlinx.serialization.*
-import kotlinx.serialization.internal.ListLikeSerializer
-import kotlinx.serialization.internal.MapLikeSerializer
 import kotlinx.serialization.modules.EmptyModule
 
 fun <T> encode(strategy: SerializationStrategy<T> , value: T, positiveInfinity: Any = Double.POSITIVE_INFINITY): Any? =
@@ -91,12 +89,15 @@ open class FirebaseCompositeEncoder constructor(
 
     override val context = EmptyModule
 
-    private fun <T> SerializationStrategy<T>.toFirebase(): SerializationStrategy<T> = when(this) {
-        is MapLikeSerializer<*, *, *, *> -> FirebaseMapSerializer() as SerializationStrategy<T>
-        is ListLikeSerializer<*, *, *> -> FirebaseListSerializer() as SerializationStrategy<T>
+    private fun <T> SerializationStrategy<T>.toFirebase(): SerializationStrategy<T> = when(this.descriptor.kind) {
+        StructureKind.MAP -> FirebaseMapSerializer() as SerializationStrategy<T>
+        StructureKind.LIST -> FirebaseListSerializer() as SerializationStrategy<T>
         else -> this
     }
 
+    override fun endStructure(descriptor: SerialDescriptor) {
+    }
+
     override fun <T : Any> encodeNullableSerializableElement(desc: SerialDescriptor, index: Int, serializer: SerializationStrategy<T>, value: T?) =
         set(desc, index, value?.let { FirebaseEncoder(positiveInfinity).apply { encode(serializer.toFirebase(), value) }.value })
 
diff --git a/firebase-common/src/commonMain/kotlin/dev/teamhub/firebase/serializers.kt b/firebase-common/src/commonMain/kotlin/dev/teamhub/firebase/serializers.kt
@@ -1,17 +1,17 @@
 package dev.teamhub.firebase
 
 import kotlinx.serialization.*
-import kotlinx.serialization.internal.UnitSerializer
-import kotlinx.serialization.internal.defaultSerializer
-import kotlinx.serialization.internal.nullable
+import kotlinx.serialization.builtins.UnitSerializer
+import kotlinx.serialization.builtins.nullable
 
+@ImplicitReflectionSerializer
 @Suppress("UNCHECKED_CAST")
-fun Any.firebaseSerializer() = (this::class.compiledSerializer() ?: this::class.defaultSerializer() ?: when(this) {
+fun Any.firebaseSerializer() = this::class.serializerOrNull() ?: when(this) {
     is Map<*, *> -> FirebaseMapSerializer()
     is List<*> -> FirebaseListSerializer()
     is Set<*> -> FirebaseListSerializer()
     else -> throw SerializationException("Can't locate argument-less serializer for $this. For generic classes, such as lists, please provide serializer explicitly.")
-}) as KSerializer<Any>
+} as KSerializer<Any>
 
 class FirebaseMapSerializer : KSerializer<Map<String, Any?>> {
 
@@ -20,19 +20,23 @@ class FirebaseMapSerializer : KSerializer<Map<String, Any?>> {
 
     override val descriptor = object : SerialDescriptor {
         override val kind = StructureKind.MAP
-        override val name = "kotlin.Map<String, Any>"
+        override val serialName = "kotlin.Map<String, Any>"
+        override val elementsCount get() = map.size
         override fun getElementIndex(name: String) = keys.indexOf(name)
         override fun getElementName(index: Int) = keys[index]
-        override val elementsCount get() = map.size
+        override fun getElementAnnotations(index: Int) = emptyList<Annotation>()
+        override fun getElementDescriptor(index: Int) = throw UnsupportedOperationException()
+        override fun isElementOptional(index: Int) = false
     }
 
+    @ImplicitReflectionSerializer
     override fun serialize(encoder: Encoder, obj: Map<String, Any?>) {
         map = obj
         keys = obj.keys.toList()
         val collectionEncoder = encoder.beginCollection(descriptor, obj.size)
         keys.forEachIndexed { index, key ->
             val value = map.getValue(key)
-            val serializer = value?.firebaseSerializer() ?: UnitSerializer.nullable as KSerializer<Any>
+            val serializer = value?.firebaseSerializer() ?: UnitSerializer().nullable as KSerializer<Any?>
             collectionEncoder.encodeNullableSerializableElement(
                 serializer.descriptor, index, serializer, value
             )
@@ -54,20 +58,23 @@ class FirebaseListSerializer : KSerializer<Iterable<Any?>> {
 
     lateinit var list: List<Any?>
 
-    override val descriptor= object : SerialDescriptor {
+    override val descriptor = object : SerialDescriptor {
         override val kind = StructureKind.LIST
-        override val name = "kotlin.List<Any>"
+        override val serialName = "kotlin.List<Any>"
+        override val elementsCount get() = list.size
         override fun getElementIndex(name: String) = throw NotImplementedError()
         override fun getElementName(index: Int) = throw NotImplementedError()
-        override val elementsCount get() = list.size
+        override fun getElementAnnotations(index: Int) = emptyList<Annotation>()
+        override fun getElementDescriptor(index: Int) = throw UnsupportedOperationException()
+        override fun isElementOptional(index: Int) = false
     }
 
     @Suppress("UNCHECKED_CAST")
     override fun serialize(encoder: Encoder, obj: Iterable<Any?>) {
         list = obj.toList()
         val collectionEncoder = encoder.beginCollection(descriptor, list.size)
         list.forEachIndexed { index, value ->
-            val serializer = value?.firebaseSerializer() ?: UnitSerializer.nullable as KSerializer<Any>
+            val serializer = value?.firebaseSerializer() ?: UnitSerializer().nullable as KSerializer<Any>
             collectionEncoder.encodeNullableSerializableElement(
                 serializer.descriptor, index, serializer, value
             )
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     `maven-publish`
 }
 
-version = "0.1.0-dev"
+version = "0.1.0-beta"
 
 android {
     compileSdkVersion(property("targetSdkVersion") as Int)
diff --git a/firebase-database/package.json b/firebase-database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@teamhubapp/firebase-database",
-  "version": "0.1.0-dev12",
+  "version": "0.1.0-beta",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-database.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/TeamHubApp/firebase-kotlin-multiplatform-sdk",
   "dependencies": {
-    "@teamhubapp/firebase-app": "0.1.0-dev12",
+    "@teamhubapp/firebase-app": "0.1.0-beta",
     "firebase": "6.2.3",
     "kotlin": "1.3.70",
     "kotlinx-coroutines-core": "1.3.4"
diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     `maven-publish`
 }
 
-version = "0.1.0-dev"
+version = "0.1.0-beta"
 
 android {
     compileSdkVersion(property("targetSdkVersion") as Int)
diff --git a/firebase-firestore/package.json b/firebase-firestore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@teamhubapp/firebase-firestore",
-  "version": "0.1.0-dev12",
+  "version": "0.1.0-beta",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-firestore.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/TeamHubApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@teamhubapp/firebase-app": "0.1.0-dev12",
+    "@teamhubapp/firebase-app": "0.1.0-beta",
     "firebase": "6.2.3",
     "kotlin": "1.3.70",
     "kotlinx-coroutines-core": "1.3.4"
diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     `maven-publish`
 }
 
-version = "0.1.0-dev"
+version = "0.1.0-beta"
 
 android {
     compileSdkVersion(property("targetSdkVersion") as Int)
diff --git a/firebase-functions/package.json b/firebase-functions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@teamhubapp/firebase-functions",
-  "version": "0.1.0-dev12",
+  "version": "0.1.0-beta",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-functions.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/TeamHubApp/firebase-kotlin-multiplatform-sdk",
   "dependencies": {
-    "@teamhubapp/firebase-app": "0.1.0-dev12",
+    "@teamhubapp/firebase-app": "0.1.0-beta",
     "firebase": "6.2.3",
     "kotlin": "1.3.70",
     "kotlinx-coroutines-core": "1.3.4"

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ repositories {`
`11`	`11`	`google()`
`12`	`12`	`}`
`13`	`13`
`14`		`-version = "0.1.0-dev"`
	`14`	`+version = "0.1.0-beta"`
`15`	`15`
`16`	`16`	`android {`
`17`	`17`	`compileSdkVersion(property("targetSdkVersion") as Int)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ plugins {`
`7`	`7`	`maven-publish`
`8`	`8`	`}`
`9`	`9`
`10`		`-version = "0.1.0-dev"`
	`10`	`+version = "0.1.0-beta"`
`11`	`11`
`12`	`12`	`android {`
`13`	`13`	`compileSdkVersion(property("targetSdkVersion") as Int)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@teamhubapp/firebase-common",`
`3`		`- "version": "0.1.0-dev14",`
	`3`	`+ "version": "0.1.0-beta14",`
`4`	`4`	`"description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",`
`5`	`5`	`"main": "firebase-common.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import kotlinx.serialization.SerialDescriptor`
`6`	`6`	`import kotlinx.serialization.StructureKind`
`7`	`7`
`8`	`8`	`actual fun FirebaseDecoder.structureDecoder(desc: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeDecoder = when(desc.kind as StructureKind) {`
`9`		`- StructureKind.CLASS -> (value as Map<, >).let { map ->`
	`9`	`+ StructureKind.CLASS, StructureKind.OBJECT -> (value as Map<, >).let { map ->`
`10`	`10`	`FirebaseClassDecoder(map.size, { map.containsKey(it) }) { desc, index -> map[desc.getElementName(index)] }`
`11`	`11`	`}`
`12`	`12`	`StructureKind.LIST -> (value as List<*>).let {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ actual fun FirebaseEncoder.structureEncoder(desc: SerialDescriptor, vararg typeP`
`10`	`10`	`StructureKind.LIST -> mutableListOf<Any?>()`
`11`	`11`	`.also { value = it }`
`12`	`12`	`.let { FirebaseCompositeEncoder(positiveInfinity) { _, index, value -> it.add(index, value) } }`
`13`		`- StructureKind.MAP, StructureKind.CLASS -> mutableMapOf<Any?, Any?>()`
	`13`	`+ StructureKind.MAP, StructureKind.CLASS, StructureKind.OBJECT -> mutableMapOf<Any?, Any?>()`
`14`	`14`	`.also { value = it }`
`15`	`15`	`.let { FirebaseCompositeEncoder(positiveInfinity) { _, index, value -> it[desc.getElementName(index)] = value } }`
`16`	`16`	`}`