Merge branch 'master' into patch-1

Author: nbransby

.github/workflows/pull_request.yml

@@ -30,6 +30,12 @@ jobs:
       run: ./gradlew assemble
     - name: Run JS Tests
       run: ./gradlew cleanTest jsTest
+    - name: Upload test artifact
+      uses: actions/upload-artifact@v2
+      if: failure()
+      with:
+        name: "JSTest Report HTML"
+        path: "firebase-firestore/build/reports/tests/jsTest/"
     - name: Run Android Instrumented Tests
       uses: reactivecircus/android-emulator-runner@v2
       with:

build.gradle.kts

@@ -67,6 +67,16 @@ subprojects {
         onlyIf { !project.gradle.startParameter.taskNames.contains("publishToMavenLocal") }
     }
 
+    tasks.whenTaskAdded {
+        enabled = when(name) {
+            "compileDebugUnitTestKotlinAndroid" -> false
+            "compileReleaseUnitTestKotlinAndroid" -> false
+            "testDebugUnitTest" -> false
+            "testReleaseUnitTest" -> false
+            else -> enabled
+        }
+    }
+
     tasks {
 
         val updateVersion by registering(Exec::class) {

firebase-app/package.json

@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-common": "1.2.0",
-    "firebase": "8.2.10",
+    "firebase": "8.5.0",
     "kotlin": "1.4.31",
     "kotlinx-coroutines-core": "1.4.3"
   }

firebase-auth/build.gradle.kts

@@ -102,8 +102,20 @@ kotlin {
 
     js {
         useCommonJs()
-        nodejs()
-        browser()
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
+        browser {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
     }
 
     sourceSets {

firebase-auth/package.json

@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.2.0",
-    "firebase": "8.2.10",
+    "firebase": "8.5.0",
     "kotlin": "1.4.31",
     "kotlinx-coroutines-core": "1.4.3"
   }

firebase-common/package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk",
   "dependencies": {
-    "firebase": "8.2.10",
+    "firebase": "8.5.0",
     "kotlin": "1.4.31",
     "kotlinx-coroutines-core": "1.4.3",
     "kotlinx-serialization-kotlinx-serialization-runtime": "1.1.0"

firebase-common/src/commonTest/kotlin/dev/gitlive/firebase/EncodersTest.kt

@@ -51,7 +51,7 @@ class EncodersTest {
 
     @Test
     fun decodeObjectNullableValue() {
-        val decoded = decode(TestData.serializer(), mapOf("map" to mapOf("key" to "value"), "nullableBool" to null))
+        val decoded = decode(TestData.serializer(), nativeMapOf("map" to mapOf("key" to "value"), "nullableBool" to null))
         assertNull(decoded.nullableBool)
     }
 }

firebase-database/package.json

@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.2.0",
-    "firebase": "8.2.10",
+    "firebase": "8.5.0",
     "kotlin": "1.4.31",
     "kotlinx-coroutines-core": "1.4.3"
   }

firebase-firestore/package.json

@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.2.0",
-    "firebase": "8.2.10",
+    "firebase": "8.5.0",
     "kotlin": "1.4.31",
     "kotlinx-coroutines-core": "1.4.3"
   }

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

@@ -39,9 +39,11 @@ class FirebaseFirestoreTest {
     @Test
     fun testStringOrderBy() = runTest {
         setupFirestoreData()
-
-        val resultDocs = Firebase.firestore.collection("FirebaseFirestoreTest")
-            .orderBy("prop1").get().documents
+        val resultDocs = Firebase.firestore
+            .collection("FirebaseFirestoreTest")
+            .orderBy("prop1")
+            .get()
+            .documents
         assertEquals(3, resultDocs.size)
         assertEquals("aaa", resultDocs[0].get("prop1"))
         assertEquals("bbb", resultDocs[1].get("prop1"))