Merge branch 'master' into ios-support

Author: nbransby

firebase-common/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     id("com.android.library")
     kotlin("multiplatform")
     kotlin("native.cocoapods")
+    kotlin("plugin.serialization") version "1.3.61"
     `maven-publish`
 }
 repositories {
@@ -80,6 +81,12 @@ kotlin {
             }
             kotlin.srcDir("src/androidMain/kotlin")
         }
+        val jvmTest by getting {
+            dependencies {
+                implementation(kotlin("test-junit"))
+            }
+            kotlin.srcDir("src/androidTest/kotlin")
+        }
         val iosMain by creating {
             dependencies {
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.14.0")

firebase-common/src/commonMain/kotlin/dev/teamhub/firebase/encoders.kt

@@ -1,6 +1,8 @@
 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? =
@@ -94,11 +96,17 @@ open class FirebaseCompositeEncoder(
         super.endStructure(desc)
     }
 
+    private fun <T> SerializationStrategy<T>.toFirebase(): SerializationStrategy<T> = when(this) {
+        is MapLikeSerializer<*, *, *, *> -> FirebaseMapSerializer() as SerializationStrategy<T>
+        is ListLikeSerializer<*, *, *> -> FirebaseListSerializer() as SerializationStrategy<T>
+        else -> this
+    }
+
     override fun <T : Any> encodeNullableSerializableElement(desc: SerialDescriptor, index: Int, serializer: SerializationStrategy<T>, value: T?) =
-        set(desc, index, value?.let { FirebaseEncoder(positiveInfinity).apply { encode(serializer, value) }.value })
+        set(desc, index, value?.let { FirebaseEncoder(positiveInfinity).apply { encode(serializer.toFirebase(), value) }.value })
 
     override fun <T> encodeSerializableElement(desc: SerialDescriptor, index: Int, serializer: SerializationStrategy<T>, value: T)  =
-        set(desc, index, FirebaseEncoder(positiveInfinity).apply { encode(serializer, value) }.value)
+        set(desc, index, FirebaseEncoder(positiveInfinity).apply { encode(serializer.toFirebase(), value) }.value)
 
     override fun encodeNonSerializableElement(desc: SerialDescriptor, index: Int, value: Any) = set(desc, index, value)