Merge pull request #14 from splendo/upstream/merge-master

Upstream/merge master

Author: corrado4eyes

.github/workflows/pull_request.yml

@@ -22,6 +22,10 @@ jobs:
       run: chmod +x gradlew
     - name: Install Carthage
       run: brew list carthage || brew install carthage
+    - name: Install Firebase tools
+      run: npm install -g firebase-tools
+    - name: Start Firebase emulator
+      run: "firebase emulators:start --config=./test/firebase.json &"
     - name: Assemble
       run: ./gradlew assemble
     - name: Run JS Tests

.gitignore

@@ -13,6 +13,7 @@ firebase-database/src/iosMain/c_interop/modules/
 Firebase*.zip
 /Firebase
 /.DS_Store
+*.log
 
 
 /**/Cartfile.resolved

README.md

@@ -1,10 +1,9 @@
-<h1 align="left">Firebase Kotlin SDK <img alt="GitHub last commit" src="https://img.shields.io/github/last-commit/gitliveapp/firebase-kotlin-sdk?style=flat-square"> <a href="https://teamhub.dev"><img src="https://img.shields.io/badge/collaborate-on%20gitlive-blueviolet?style=flat-square"></a></h1>
+<h1 align="left">Firebase Kotlin SDK <img alt="GitHub last commit" src="https://img.shields.io/github/last-commit/gitliveapp/firebase-kotlin-sdk?style=flat-square"> <a href="https://git.live"><img src="https://img.shields.io/badge/collaborate-on%20gitlive-blueviolet?style=flat-square"></a></h1>
 <img align="left" width="75px" src="https://avatars2.githubusercontent.com/u/42865805?s=200&v=4"> 
-  <b>Built and maintained with 🧡 by <a href="https://teamhub.dev">GitLive</a></b><br/>
+  <b>Built and maintained with 🧡 by <a href="https://git.live">GitLive</a></b><br/>
   <i>Real-time code collaboration inside any IDE</i><br/>
-  🔓 <a href="https://teamhub.typeform.com/to/uSS8cv">Request Early Access</a>
-<h4></h4>
-
+<br/>
+<br/>
 The Firebase Kotlin SDK is a Kotlin-first SDK for Firebase. It's API is similar to the [Firebase Android SDK Kotlin Extensions](https://firebase.github.io/firebase-android-sdk/reference/kotlin/firebase-ktx/) but also supports multiplatform projects, enabling you to use Firebase directly from your common source targeting *iOS*, *Android* or *JS*.
 
 ## Available libraries
@@ -13,12 +12,12 @@ The following libraries are available for the various Firebase products.
 
 | Service or Product	                                                                 | Gradle Dependency                                                                                                                   | API Coverage                                                                                                                                                                                                               |
 | ------------------------------------------------------------------------------------ | :-----------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [Authentication](https://firebase.google.com/docs/auth#kotlin-android)               | [`dev.gitlive:firebase-auth:1.0.0`](https://search.maven.org/artifact/dev.gitlive/firebase-auth/1.0.0/pom)           | [![80%](https://img.shields.io/badge/-80%25-green?style=flat-square)](/firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/auth.kt) |
-| [Realtime Database](https://firebase.google.com/docs/database#kotlin-android)        | [`dev.gitlive:firebase-database:1.0.0`](https://search.maven.org/artifact/dev.gitlive/firebase-database/1.0.0/pom)   | [![70%](https://img.shields.io/badge/-70%25-orange?style=flat-square)](/firebase-database/src/commonMain/kotlin/dev/gitlive/firebase/database/database.kt) |
-| [Cloud Firestore](https://firebase.google.com/docs/firestore#kotlin-android)         | [`dev.gitlive:firebase-firestore:1.0.0`](https://search.maven.org/artifact/dev.gitlive/firebase-firestore/1.0.0/pom) | [![60%](https://img.shields.io/badge/-60%25-orange?style=flat-square)](/firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt) |
-| [Cloud Functions](https://firebase.google.com/docs/functions/callable#kotlin-android)| [`dev.gitlive:firebase-functions:1.0.0`](https://search.maven.org/artifact/dev.gitlive/firebase-functions/1.0.0/pom) | [![80%](https://img.shields.io/badge/-80%25-green?style=flat-square)](/firebase-functions/src/commonMain/kotlin/dev/gitlive/firebase/functions/functions.kt) |
-| [Cloud Messaging](https://firebase.google.com/docs/messaging#kotlin-android)         | [`dev.gitlive:firebase-messaging:1.0.0`](https://search.maven.org/artifact/dev.gitlive/firebase-messaging/1.0.0/pom) | ![0%](https://img.shields.io/badge/-0%25-lightgrey?style=flat-square) |
-| [Cloud Storage](https://firebase.google.com/docs/storage#kotlin-android)             | [`dev.gitlive:firebase-storage:1.0.0`](https://search.maven.org/artifact/dev.gitlive/firebase-storage/1.0.0/pom)     | ![0%](https://img.shields.io/badge/-0%25-lightgrey?style=flat-square) |
+| [Authentication](https://firebase.google.com/docs/auth#kotlin-android)               | [`dev.gitlive:firebase-auth:1.2.0`](https://search.maven.org/artifact/dev.gitlive/firebase-auth/1.2.0/pom)           | [![80%](https://img.shields.io/badge/-80%25-green?style=flat-square)](/firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/auth.kt) |
+| [Realtime Database](https://firebase.google.com/docs/database#kotlin-android)        | [`dev.gitlive:firebase-database:1.2.0`](https://search.maven.org/artifact/dev.gitlive/firebase-database/1.2.0/pom)   | [![70%](https://img.shields.io/badge/-70%25-orange?style=flat-square)](/firebase-database/src/commonMain/kotlin/dev/gitlive/firebase/database/database.kt) |
+| [Cloud Firestore](https://firebase.google.com/docs/firestore#kotlin-android)         | [`dev.gitlive:firebase-firestore:1.2.0`](https://search.maven.org/artifact/dev.gitlive/firebase-firestore/1.2.0/pom) | [![60%](https://img.shields.io/badge/-60%25-orange?style=flat-square)](/firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt) |
+| [Cloud Functions](https://firebase.google.com/docs/functions/callable#kotlin-android)| [`dev.gitlive:firebase-functions:1.2.0`](https://search.maven.org/artifact/dev.gitlive/firebase-functions/1.2.0/pom) | [![80%](https://img.shields.io/badge/-80%25-green?style=flat-square)](/firebase-functions/src/commonMain/kotlin/dev/gitlive/firebase/functions/functions.kt) |
+| [Cloud Messaging](https://firebase.google.com/docs/messaging#kotlin-android)         | [`dev.gitlive:firebase-messaging:1.2.0`](https://search.maven.org/artifact/dev.gitlive/firebase-messaging/1.2.0/pom) | ![0%](https://img.shields.io/badge/-0%25-lightgrey?style=flat-square) |
+| [Cloud Storage](https://firebase.google.com/docs/storage#kotlin-android)             | [`dev.gitlive:firebase-storage:1.2.0`](https://search.maven.org/artifact/dev.gitlive/firebase-storage/1.2.0/pom)     | ![0%](https://img.shields.io/badge/-0%25-lightgrey?style=flat-square) |
 
 Is the Firebase library or API you need missing? [Create an issue](https://github.com/GitLiveApp/firebase-kotlin-sdk/issues/new?labels=API+coverage&template=increase-api-coverage.md&title=Add+%5Bclass+name%5D.%5Bfunction+name%5D+to+%5Blibrary+name%5D+for+%5Bplatform+names%5D) to request additional API coverage or be awesome and [submit a PR](https://github.com/GitLiveApp/firebase-kotlin-sdk/fork)
 
@@ -87,7 +86,7 @@ You can also omit the serializer but this is discouraged due to a [current limit
 
 <h4><a href="https://firebase.google.com/docs/firestore/manage-data/add-data#server_timestamp">Server Timestamp</a></h3>
 
-[Firestore](https://firebase.google.com/docs/reference/js/firebase.database.ServerValue#timestamp) and the [Realtime Database](https://firebase.google.com/docs/reference/android/com/google/firebase/database/ServerValue#TIMESTAMP) provide a sentinel value you can use to set a field in your document to a server timestamp. So you can use these values in custom classes they are of type `Double`:
+[Firestore](https://firebase.google.com/docs/reference/kotlin/com/google/firebase/firestore/FieldValue?hl=en#serverTimestamp()) and the [Realtime Database](https://firebase.google.com/docs/reference/android/com/google/firebase/database/ServerValue#TIMESTAMP) provide a sentinel value you can use to set a field in your document to a server timestamp. So you can use these values in custom classes they are of type `Double`:
 
 ```kotlin
 @Serializable
@@ -164,12 +163,12 @@ If you are building a Kotlin multiplatform library which will be consumed from J
 
 ```json
 "dependencies": {
-  "@gitlive/firebase-auth": "1.0.0",
-  "@gitlive/firebase-database": "1.0.0",
-  "@gitlive/firebase-firestore": "1.0.0",
-  "@gitlive/firebase-functions": "1.0.0",
-  "@gitlive/firebase-storage": "1.0.0",
-  "@gitlive/firebase-messaging": "1.0.0"
+  "@gitlive/firebase-auth": "1.2.0",
+  "@gitlive/firebase-database": "1.2.0",
+  "@gitlive/firebase-firestore": "1.2.0",
+  "@gitlive/firebase-functions": "1.2.0",
+  "@gitlive/firebase-storage": "1.2.0",
+  "@gitlive/firebase-messaging": "1.2.0"
 }
 ```
 

build.gradle.kts

@@ -4,8 +4,8 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    kotlin("multiplatform") version "1.4.10" apply false
-    id("de.undercouch.download").version("3.4.3")
+    kotlin("multiplatform") version "1.4.21" apply false
+    id("de.undercouch.download").version("4.1.1")
     id("base")
 }
 
@@ -19,8 +19,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.0.1")
-        classpath("de.undercouch:gradle-download-task:4.0.4")
+        classpath("com.android.tools.build:gradle:4.0.2")
+        classpath("de.undercouch:gradle-download-task:4.1.1")
         classpath("com.adarshr:gradle-test-logger-plugin:2.0.0")
     }
 }
@@ -187,18 +187,18 @@ subprojects {
 
         dependencies {
             "commonMainImplementation"(kotlin("stdlib-common"))
-            "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
+            "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2")
             "jsMainImplementation"(kotlin("stdlib-js"))
-            "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.9")
+            "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.4.2")
             "commonTestImplementation"(kotlin("test-common"))
             "commonTestImplementation"(kotlin("test-annotations-common"))
-            "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
+            "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2")
             "jsTestImplementation"(kotlin("test-js"))
             "androidAndroidTestImplementation"(kotlin("test-junit"))
             "androidAndroidTestImplementation"("junit:junit:4.13")
-            "androidAndroidTestImplementation"("androidx.test:core:1.2.0")
-            "androidAndroidTestImplementation"("androidx.test.ext:junit:1.1.1")
-            "androidAndroidTestImplementation"("androidx.test:runner:1.2.0")
+            "androidAndroidTestImplementation"("androidx.test:core:1.3.0")
+            "androidAndroidTestImplementation"("androidx.test.ext:junit:1.1.2")
+            "androidAndroidTestImplementation"("androidx.test:runner:1.3.0")
         }
     }
 

firebase-app/build.gradle.kts

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

firebase-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-app",
-  "version": "0",
+  "version": "1.0.0",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-app.js",
   "scripts": {
@@ -23,9 +23,9 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-common": "0",
-    "firebase": "7.14.0",
-    "kotlin": "1.3.72",
-    "kotlinx-coroutines-core": "1.3.5"
+    "@gitlive/firebase-common": "1.1.0",
+    "firebase": "8.2.0",
+    "kotlin": "1.4.21",
+    "kotlinx-coroutines-core": "1.4.2"
   }
 }

firebase-app/src/iosMain/c_interop/Cartfile

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

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

@@ -9,4 +9,20 @@ import kotlinx.coroutines.promise
 
 actual val context: Any = Unit
 
-actual fun runTest(test: suspend () -> Unit) = GlobalScope.promise { test() }.unsafeCast<Unit>()
+actual fun runTest(test: suspend () -> Unit) = GlobalScope
+    .promise {
+        try {
+            test()
+        } catch (e: dynamic) {
+            e.log()
+            throw e
+        }
+    }.asDynamic()
+
+internal fun Throwable.log() {
+    console.error(this)
+    cause?.let {
+        console.error("Caused by:")
+        it.log()
+    }
+}

firebase-auth/build.gradle.kts

@@ -31,7 +31,10 @@ android {
         getByName("main") {
             manifest.srcFile("src/androidMain/AndroidManifest.xml")
         }
-        getByName("androidTest").java.srcDir(file("src/androidAndroidTest/kotlin"))
+        getByName("androidTest"){
+            java.srcDir(file("src/androidAndroidTest/kotlin"))
+            manifest.srcFile("src/androidAndroidTest/AndroidManifest.xml")
+        }
     }
     testOptions {
         unitTests.apply {
@@ -99,7 +102,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-auth:19.3.2")
+                api("com.google.firebase:firebase-auth:20.0.1")
             }
         }
 

firebase-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-auth",
-  "version": "0",
+  "version": "1.0.0",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-auth.js",
   "scripts": {
@@ -23,9 +23,9 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-app": "0",
-    "firebase": "7.14.0",
-    "kotlin": "1.3.72",
-    "kotlinx-coroutines-core": "1.3.5"
+    "@gitlive/firebase-app": "1.1.0",
+    "firebase": "8.2.0",
+    "kotlin": "1.4.21",
+    "kotlinx-coroutines-core": "1.4.2"
   }
 }