fix ios targets compilation

update to kotlin 1.3.72

Author: nbransby

build.gradle.kts

@@ -2,7 +2,7 @@ import de.undercouch.gradle.tasks.download.Download
 import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
-    kotlin("multiplatform") version "1.3.70" apply false
+    kotlin("multiplatform") version "1.3.72" apply false
     id("de.undercouch.download").version("3.4.3")
     id("base")
 }

firebase-database/src/iosMain/kotlin/dev/gitlive/firebase/database/database.kt

@@ -24,10 +24,10 @@ import platform.Foundation.*
 import kotlin.collections.component1
 import kotlin.collections.component2
 
-fun encode(value: Any?) =
-    dev.gitlive.firebase.encode(value, FIRServerValue.timestamp())
-fun <T> encode(strategy: SerializationStrategy<T> , value: T): Any? =
-    dev.gitlive.firebase.encode(strategy, value, FIRServerValue.timestamp())
+fun encode(value: Any?, shouldEncodeElementDefault: Boolean) =
+    dev.gitlive.firebase.encode(value, shouldEncodeElementDefault, FIRServerValue.timestamp())
+fun <T> encode(strategy: SerializationStrategy<T> , value: T, shouldEncodeElementDefault: Boolean): Any? =
+    dev.gitlive.firebase.encode(strategy, value, shouldEncodeElementDefault, FIRServerValue.timestamp())
 
 actual val Firebase.database
         by lazy { FirebaseDatabase(FIRDatabase.database()) }
@@ -110,17 +110,17 @@ actual class DatabaseReference internal constructor(
     actual fun push() = DatabaseReference(ios.childByAutoId(), persistenceEnabled)
     actual fun onDisconnect() = OnDisconnect(ios, persistenceEnabled)
 
-    actual suspend fun setValue(value: Any?) {
-        ios.await(persistenceEnabled) { setValue(encode(value), it) }
+    actual suspend fun setValue(value: Any?, encodeDefaults: Boolean) {
+        ios.await(persistenceEnabled) { setValue(encode(value, encodeDefaults), it) }
     }
 
-    actual suspend fun <T> setValue(strategy: SerializationStrategy<T>, value: T) {
-        ios.await(persistenceEnabled) { setValue(encode(strategy, value), it) }
+    actual suspend fun <T> setValue(strategy: SerializationStrategy<T>, value: T, encodeDefaults: Boolean) {
+        ios.await(persistenceEnabled) { setValue(encode(strategy, value, encodeDefaults), it) }
     }
 
     @Suppress("UNCHECKED_CAST")
-    actual suspend fun updateChildren(update: Map<String, Any?>) {
-        ios.await(persistenceEnabled) { updateChildValues(encode(update) as Map<Any?, *>, it) }
+    actual suspend fun updateChildren(update: Map<String, Any?>, encodeDefaults: Boolean) {
+        ios.await(persistenceEnabled) { updateChildValues(encode(update, encodeDefaults) as Map<Any?, *>, it) }
     }
 
     actual suspend fun removeValue() {
@@ -157,16 +157,16 @@ actual class OnDisconnect internal constructor(
         ios.await(persistenceEnabled) { cancelDisconnectOperationsWithCompletionBlock(it) }
     }
 
-    actual suspend fun setValue(value: Any) {
-        ios.await(persistenceEnabled) { onDisconnectSetValue(encode(value), it) }
+    actual suspend fun setValue(value: Any, encodeDefaults: Boolean) {
+        ios.await(persistenceEnabled) { onDisconnectSetValue(encode(value, encodeDefaults), it) }
     }
 
-    actual suspend fun <T> setValue(strategy: SerializationStrategy<T>, value: T) {
-        ios.await(persistenceEnabled) { onDisconnectSetValue(encode(strategy, value), it) }
+    actual suspend fun <T> setValue(strategy: SerializationStrategy<T>, value: T, encodeDefaults: Boolean) {
+        ios.await(persistenceEnabled) { onDisconnectSetValue(encode(strategy, value, encodeDefaults), it) }
     }
 
-    actual suspend fun updateChildren(update: Map<String, Any?>) {
-        ios.await(persistenceEnabled) { onDisconnectUpdateChildValues(update.mapValues { (_, it) -> encode(it) } as Map<Any?, *>, it) }
+    actual suspend fun updateChildren(update: Map<String, Any?>, encodeDefaults: Boolean) {
+        ios.await(persistenceEnabled) { onDisconnectUpdateChildValues(update.mapValues { (_, it) -> encode(it, encodeDefaults) } as Map<Any?, *>, it) }
     }
 }
 

firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt

@@ -13,6 +13,11 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.SerializationStrategy
 import platform.Foundation.NSError
+import dev.gitlive.firebase.Firebase
+import dev.gitlive.firebase.FirebaseApp
+import dev.gitlive.firebase.decode
+import dev.gitlive.firebase.encode
+import dev.gitlive.firebase.FirebaseException
 
 actual val Firebase.firestore get() =
     FirebaseFirestore(FIRFirestore.firestore())
@@ -28,7 +33,7 @@ actual class FirebaseFirestore(val ios: FIRFirestore) {
 
     actual fun batch() = WriteBatch(ios.batch())
 
-    actual fun setLoggingEnabled(loggingEnabled: Boolean) =
+    actual fun setLoggingEnabled(loggingEnabled: Boolean): Unit =
         FIRFirestore.enableLogging(loggingEnabled)
 
     actual suspend fun <T> runTransaction(func: suspend Transaction.() -> T) =
@@ -47,7 +52,7 @@ actual class WriteBatch(val ios: FIRWriteBatch) {
         ios.setData(encode(data, encodeDefaults)!! as Map<Any?, *>, documentRef.ios, mergeFieldPaths.asList()).let { this }
 
     actual fun <T> set(documentRef: DocumentReference, strategy: SerializationStrategy<T>, data: T, encodeDefaults: Boolean, merge: Boolean) =
-        ios.setData(encode(strategy, data)!! as Map<Any?, *>, documentRef.ios, merge).let { this }
+        ios.setData(encode(strategy, data, encodeDefaults)!! as Map<Any?, *>, documentRef.ios, merge).let { this }
 
     actual fun <T> set(documentRef: DocumentReference, strategy: SerializationStrategy<T>, data: T, encodeDefaults: Boolean, vararg mergeFields: String) =
         ios.setData(encode(strategy, data, encodeDefaults)!! as Map<Any?, *>, documentRef.ios, mergeFields.asList()).let { this }

firebase-functions/src/iosMain/kotlin/dev/gitlive/firebase/functions/functions.kt

@@ -35,11 +35,11 @@ actual class FirebaseFunctions internal constructor(val ios: FIRFunctions) {
 actual class HttpsCallableReference internal constructor(val ios: FIRHTTPSCallable) {
     actual suspend operator fun invoke() = HttpsCallableResult(ios.awaitResult { callWithCompletion(it) })
 
-    actual suspend operator fun invoke(data: Any) =
-        HttpsCallableResult(ios.awaitResult { callWithObject(encode(data), it) })
+    actual suspend operator fun invoke(data: Any, encodeDefaults: Boolean) =
+        HttpsCallableResult(ios.awaitResult { callWithObject(encode(data, encodeDefaults), it) })
 
-    actual suspend operator fun <T> invoke(strategy: SerializationStrategy<T>, data: T) =
-        HttpsCallableResult(ios.awaitResult { callWithObject(encode(strategy, data), it) })
+    actual suspend operator fun <T> invoke(strategy: SerializationStrategy<T>, data: T, encodeDefaults: Boolean) =
+        HttpsCallableResult(ios.awaitResult { callWithObject(encode(strategy, data, encodeDefaults), it) })
 }
 
 actual class HttpsCallableResult constructor(val ios: FIRHTTPSCallableResult) {