Dependency updates (#118)

suntrix · web-flow · commit b6c716af83bc · 2020-12-16T15:45:22.000Z
* updated dependencies (fixes #98, #108) * removed duplicate entry * need to split externals.kt to support default import (https://github.com/firebase/firebase-js-sdk/blob/master/packages/firebase/CHANGELOG.md#800) * fixed self call loop
diff --git a/build.gradle.kts b/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.1.1")
+        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")
         }
     }
 
diff --git a/firebase-app/build.gradle.kts b/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")
             }
         }
 
diff --git a/firebase-app/package.json b/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.0.0",
+    "firebase": "8.2.0",
+    "kotlin": "1.4.21",
+    "kotlinx-coroutines-core": "1.4.2"
   }
 }
diff --git a/firebase-app/src/iosMain/c_interop/Cartfile b/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
diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -99,7 +99,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")
             }
         }
 
diff --git a/firebase-auth/package.json b/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.0.0",
+    "firebase": "8.2.0",
+    "kotlin": "1.4.21",
+    "kotlinx-coroutines-core": "1.4.2"
   }
 }
diff --git a/firebase-auth/src/iosMain/c_interop/Cartfile b/firebase-auth/src/iosMain/c_interop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 6.30.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 7.3.0
diff --git a/firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -155,8 +155,7 @@ private fun NSError.toException() = when(domain) {
         FIRAuthErrorCodeInvalidActionCode,
         FIRAuthErrorCodeExpiredActionCode -> FirebaseAuthActionCodeException(toString())
 
-        FIRAuthErrorCodeInvalidEmail,
-        FIRAuthErrorCodeEmailAlreadyInUse -> FirebaseAuthEmailException(toString())
+        FIRAuthErrorCodeInvalidEmail -> FirebaseAuthEmailException(toString())
 
         FIRAuthErrorCodeCaptchaCheckFailed,
         FIRAuthErrorCodeInvalidPhoneNumber,
diff --git a/firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/user.kt b/firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/user.kt
@@ -45,7 +45,7 @@ actual class FirebaseUser internal constructor(val ios: FIRUser) {
         ios.awaitResult<FIRUser, FIRAuthDataResult?> { reauthenticateWithCredential(credential.ios, it) }.run { Unit }
 
     actual suspend fun reauthenticateAndRetrieveData(credential: AuthCredential): AuthResult =
-        AuthResult(ios.awaitResult { reauthenticateAndRetrieveDataWithCredential(credential.ios, it) })
+        AuthResult(ios.awaitResult { reauthenticateWithCredential(credential.ios, it) })
 
     actual suspend fun sendEmailVerification(actionCodeSettings: ActionCodeSettings?) = ios.await {
         actionCodeSettings?.let { settings -> sendEmailVerificationWithActionCodeSettings(settings.toIos(), it) }
diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts
@@ -7,7 +7,7 @@ version = project.property("firebase-common.version") as String
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
-    kotlin("plugin.serialization") version "1.4.10"
+    kotlin("plugin.serialization") version "1.4.21"
 }
 
 android {
@@ -63,17 +63,17 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0")
+                api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.1")
             }
         }
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-common:19.3.0")
+                api("com.google.firebase:firebase-common:19.4.0")
             }
         }
         val jsMain by getting {
             dependencies {
-                api(npm("firebase", "7.14.0"))
+                api(npm("firebase", "8.2.0"))
             }
         }
         val iosMain by getting {
diff --git a/firebase-common/package.json b/firebase-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-common",
-  "version": "0",
+  "version": "1.0.0",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-common.js",
   "scripts": {
@@ -23,9 +23,9 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk",
   "dependencies": {
-    "firebase": "7.14.0",
-    "kotlin": "1.3.72",
-    "kotlinx-coroutines-core": "1.3.5",
-    "kotlinx-serialization-kotlinx-serialization-runtime": "0.20.0"
+    "firebase": "8.2.0",
+    "kotlin": "1.4.21",
+    "kotlinx-coroutines-core": "1.4.2",
+    "kotlinx-serialization-kotlinx-serialization-runtime": "1.0.1"
   }
 }
diff --git a/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt b/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt
@@ -2,26 +2,14 @@
  * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
  */
 
+@file:JsModule("firebase/app")
+
 package dev.gitlive.firebase
 
 import kotlin.js.Json
 import kotlin.js.Promise
 
-@JsModule("firebase/functions")
-external object functions
-
-@JsModule("firebase/auth")
-external object auth
-
-@JsModule("firebase/database")
-external object database
-
-@JsModule("firebase/firestore")
-external object firestore
-
-typealias SnapshotCallback = (data: firebase.database.DataSnapshot, b: String?) -> Unit
-
-@JsModule("firebase/app")
+@JsName("default")
 external object firebase {
 
     open class App {
@@ -423,7 +411,3 @@ external object firebase {
         }
     }
 }
-
-operator fun firebase.functions.HttpsCallable.invoke() = asDynamic()() as Promise<firebase.functions.HttpsCallableResult>
-operator fun firebase.functions.HttpsCallable.invoke(data: Any?) = asDynamic()(data) as Promise<firebase.functions.HttpsCallableResult>
-
diff --git a/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals2.kt b/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals2.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.gitlive.firebase
+
+import kotlin.js.Promise
+
+@JsModule("firebase/functions")
+external object functions
+
+@JsModule("firebase/auth")
+external object auth
+
+@JsModule("firebase/database")
+external object database
+
+@JsModule("firebase/firestore")
+external object firestore
+
+typealias SnapshotCallback = (data: firebase.database.DataSnapshot, b: String?) -> Unit
+
+operator fun firebase.functions.HttpsCallable.invoke() = asDynamic()() as Promise<firebase.functions.HttpsCallableResult>
+operator fun firebase.functions.HttpsCallable.invoke(data: Any?) = asDynamic()(data) as Promise<firebase.functions.HttpsCallableResult>
+
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -76,7 +76,7 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-database:19.3.1")
+                api("com.google.firebase:firebase-database:19.5.1")
             }
         }
         val jsMain by getting {}
diff --git a/firebase-database/package.json b/firebase-database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-database",
-  "version": "0",
+  "version": "1.0.0",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-database.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.0.0",
+    "firebase": "8.2.0",
+    "kotlin": "1.4.21",
+    "kotlinx-coroutines-core": "1.4.2"
   }
 }
diff --git a/firebase-database/src/iosMain/c_interop/Cartfile b/firebase-database/src/iosMain/c_interop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json" == 6.30.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json" == 7.3.0
diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts
@@ -3,7 +3,7 @@ version = project.property("firebase-firestore.version") as String
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
-    kotlin("plugin.serialization") version "1.4.10"
+    kotlin("plugin.serialization") version "1.4.21"
 }
 
 android {
@@ -12,7 +12,7 @@ android {
         minSdkVersion(property("minSdkVersion") as Int)
         targetSdkVersion(property("targetSdkVersion") as Int)
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        setMultiDexEnabled(true)
+        multiDexEnabled = true
     }
     sourceSets {
         getByName("main") {
@@ -75,7 +75,7 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-firestore:21.5.0")
+                api("com.google.firebase:firebase-firestore:22.0.0")
                 implementation("com.android.support:multidex:1.0.3")
             }
         }
diff --git a/firebase-firestore/package.json b/firebase-firestore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-firestore",
-  "version": "0",
+  "version": "1.0.0",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-firestore.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.0.0",
+    "firebase": "8.2.0",
+    "kotlin": "1.4.21",
+    "kotlinx-coroutines-core": "1.4.2"
   }
 }
diff --git a/firebase-firestore/src/iosMain/c_interop/Cartfile b/firebase-firestore/src/iosMain/c_interop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json" == 6.30.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json" == 7.3.0
diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts
@@ -70,7 +70,7 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-functions:19.0.2")
+                api("com.google.firebase:firebase-functions:19.1.0")
             }
         }
         val iosMain by getting {}
diff --git a/firebase-functions/package.json b/firebase-functions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-functions",
-  "version": "0",
+  "version": "1.0.0",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-functions.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.0.0",
+    "firebase": "8.2.0",
+    "kotlin": "1.4.21",
+    "kotlinx-coroutines-core": "1.4.2"
   }
 }
diff --git a/firebase-functions/src/iosMain/c_interop/Cartfile b/firebase-functions/src/iosMain/c_interop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json" == 6.30.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json" == 7.3.0
diff --git a/firebase-functions/src/iosMain/kotlin/dev/gitlive/firebase/functions/functions.kt b/firebase-functions/src/iosMain/kotlin/dev/gitlive/firebase/functions/functions.kt
@@ -25,7 +25,7 @@ actual fun Firebase.functions(app: FirebaseApp) =
     FirebaseFunctions(FIRFunctions.functionsForApp(app.ios))
 
 actual fun Firebase.functions(app: FirebaseApp, region: String) =
-    FirebaseFunctions(FIRFunctions.functionsForApp(app.ios, region))
+    FirebaseFunctions(FIRFunctions.functionsForApp(app.ios, region = region))
 
 actual class FirebaseFunctions internal constructor(val ios: FIRFunctions) {
     actual fun httpsCallable(name: String, timeout: Long?) =
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ kotlin {`
`68`	`68`	`}`
`69`	`69`	`val androidMain by getting {`
`70`	`70`	`dependencies {`
`71`		`- api("com.google.firebase:firebase-common:19.3.1")`
	`71`	`+ api("com.google.firebase:firebase-common:19.4.0")`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 6.30.0`
	`1`	`+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 7.3.0`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ kotlin {`
`99`	`99`
`100`	`100`	`val androidMain by getting {`
`101`	`101`	`dependencies {`
`102`		`- api("com.google.firebase:firebase-auth:19.3.2")`
	`102`	`+ api("com.google.firebase:firebase-auth:20.0.1")`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ version = project.property("firebase-common.version") as String`
`7`	`7`	`plugins {`
`8`	`8`	`id("com.android.library")`
`9`	`9`	`kotlin("multiplatform")`
`10`		`- kotlin("plugin.serialization") version "1.4.10"`
	`10`	`+ kotlin("plugin.serialization") version "1.4.21"`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`android {`
`@@ -63,17 +63,17 @@ kotlin {`
`63`	`63`	`sourceSets {`
`64`	`64`	`val commonMain by getting {`
`65`	`65`	`dependencies {`
`66`		`- api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0")`
	`66`	`+ api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.1")`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`val androidMain by getting {`
`70`	`70`	`dependencies {`
`71`		`- api("com.google.firebase:firebase-common:19.3.0")`
	`71`	`+ api("com.google.firebase:firebase-common:19.4.0")`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`val jsMain by getting {`
`75`	`75`	`dependencies {`
`76`		`- api(npm("firebase", "7.14.0"))`
	`76`	`+ api(npm("firebase", "8.2.0"))`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`val iosMain by getting {`