Merge branch 'master' into fix_crash_on_ios_with_remoteConfig

Author: nbransby

README.md

@@ -93,7 +93,13 @@ You can also omit the serializer but this is discouraged due to a [current limit
 
 ```kotlin
 @Serializable
-data class Post(val timestamp: Double = ServerValue.TIMESTAMP)
+data class Post(
+    // In case using Realtime Database.
+    val timestamp: Double = ServerValue.TIMESTAMP,
+    // In case using Cloud Firestore.
+    val timestamp: Double = FieldValue.serverTimestamp,
+)
+
 ```
 
 <h3><a href="https://kotlinlang.org/docs/reference/functions.html#default-arguments">Default arguments</a></h3>

build.gradle.kts

@@ -17,24 +17,25 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.1")
+        classpath("com.android.tools.build:gradle:7.0.3")
         classpath("com.adarshr:gradle-test-logger-plugin:2.1.1")
     }
 }
 
 val targetSdkVersion by extra(30)
-val minSdkVersion by extra(16)
+val minSdkVersion by extra(19)
 
 tasks {
     val updateVersions by registering {
         dependsOn(
             "firebase-app:updateVersion", "firebase-app:updateDependencyVersion",
             "firebase-auth:updateVersion", "firebase-auth:updateDependencyVersion",
             "firebase-common:updateVersion", "firebase-common:updateDependencyVersion",
+            "firebase-config:updateVersion", "firebase-config:updateDependencyVersion",
             "firebase-database:updateVersion", "firebase-database:updateDependencyVersion",
             "firebase-firestore:updateVersion", "firebase-firestore:updateDependencyVersion",
             "firebase-functions:updateVersion", "firebase-functions:updateDependencyVersion",
-            "firebase-config:updateVersion", "firebase-config:updateDependencyVersion"
+            "firebase-installations:updateVersion", "firebase-installations:updateDependencyVersion"
         )
     }
 }
@@ -154,8 +155,8 @@ subprojects {
             }
         }
 
-        if (projectDir.resolve("src/nativeInterop/cinterop/Cartfile").exists()) { // skipping firebase-common module
-            listOf("bootstrap", "update").forEach {
+        val carthageTasks = if (projectDir.resolve("src/nativeInterop/cinterop/Cartfile").exists()) { // skipping firebase-common module
+            listOf("bootstrap", "update").map {
                 task<Exec>("carthage${it.capitalize()}") {
                     group = "carthage"
                     executable = "carthage"
@@ -166,11 +167,13 @@ subprojects {
                     )
                 }
             }
-        }
+        } else emptyList()
 
         if (Os.isFamily(Os.FAMILY_MAC)) {
             withType(org.jetbrains.kotlin.gradle.tasks.CInteropProcess::class) {
-                dependsOn("carthageBootstrap")
+                if (carthageTasks.isNotEmpty()) {
+                    dependsOn("carthageBootstrap")
+                }
             }
         }
 
@@ -196,7 +199,7 @@ subprojects {
         dependencies {
             "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2-native-mt")
             "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.2-native-mt")
-            "androidMainImplementation"(platform("com.google.firebase:firebase-bom:28.4.1"))
+            "androidMainImplementation"(platform("com.google.firebase:firebase-bom:29.0.1"))
             "commonTestImplementation"(kotlin("test-common"))
             "commonTestImplementation"(kotlin("test-annotations-common"))
             "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2-native-mt")

firebase-app/build.gradle.kts

@@ -134,7 +134,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-common-ktx")
+                api("com.google.firebase:firebase-common")
             }
         }
 

firebase-app/package.json

@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-common": "1.4.3",
-    "firebase": "8.10.0",
+    "firebase": "9.4.1",
     "kotlin": "1.5.31",
     "kotlinx-coroutines-core": "1.5.2-native-mt"
   }

firebase-app/src/iosMain/c_interop/Cartfile.resolved

@@ -14,7 +14,7 @@ actual fun runTest(test: suspend () -> Unit) = GlobalScope
         try {
             test()
         } catch (e: dynamic) {
-            e.log()
+            (e as? Throwable)?.log()
             throw e
         }
     }.asDynamic()

firebase-app/src/jsTest/kotlin/dev/gitlive/firebase/firebase.kt

@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.8.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.9.1

firebase-app/src/nativeInterop/cinterop/Cartfile

@@ -165,7 +165,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-auth-ktx")
+                api("com.google.firebase:firebase-auth")
             }
         }
 

firebase-auth/build.gradle.kts

@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.4.3",
-    "firebase": "8.10.0",
+    "firebase": "9.4.1",
     "kotlin": "1.5.31",
     "kotlinx-coroutines-core": "1.5.2-native-mt"
   }