Merge remote-tracking branch 'GitLiveApp/master' into increase_auth_coverage

Author: Daeda88

build.gradle.kts

@@ -163,8 +163,10 @@ subprojects {
             }
         }
 
-        withType(org.jetbrains.kotlin.gradle.tasks.CInteropProcess::class) {
-            dependsOn("carthageBootstrap")
+        if (Os.isFamily(Os.FAMILY_MAC)) {
+            withType(org.jetbrains.kotlin.gradle.tasks.CInteropProcess::class) {
+                dependsOn("carthageBootstrap")
+            }
         }
 
         create("carthageClean", Delete::class.java) {

firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -178,12 +178,12 @@ internal inline fun <R> rethrow(function: () -> R): R {
         return function()
     } catch (e: Exception) {
         throw e
-    } catch(e: Throwable) {
+    } catch(e: dynamic) {
         throw errorToException(e)
     }
 }
 
-internal fun errorToException(cause: Throwable) = when(val code = cause.asDynamic().code as String?) {
+private fun errorToException(cause: dynamic) = when(val code = (cause.code as String?)?.toLowerCase()) {
     "auth/invalid-user-token" -> FirebaseAuthInvalidUserException(code, cause)
     "auth/requires-recent-login" -> FirebaseAuthRecentLoginRequiredException(code, cause)
     "auth/user-disabled" -> FirebaseAuthInvalidUserException(code, cause)

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

@@ -150,7 +150,7 @@ inline fun <R> rethrow(function: () -> R): R {
         return function()
     } catch (e: Exception) {
         throw e
-    } catch(e: Throwable) {
+    } catch(e: dynamic) {
         throw DatabaseException(e)
     }
 }

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

@@ -387,12 +387,12 @@ inline fun <R> rethrow(function: () -> R): R {
         return function()
     } catch (e: Exception) {
         throw e
-    } catch(e: Throwable) {
+    } catch(e: dynamic) {
         throw errorToException(e)
     }
 }
 
-fun errorToException(e: Throwable) = when(e.asDynamic().code as String?) {
+fun errorToException(e: dynamic) = when(e?.code?.toLowerCase()) {
     "cancelled" -> FirebaseFirestoreException(e, FirestoreExceptionCode.CANCELLED)
     "invalid-argument" -> FirebaseFirestoreException(e, FirestoreExceptionCode.INVALID_ARGUMENT)
     "deadline-exceeded" -> FirebaseFirestoreException(e, FirestoreExceptionCode.DEADLINE_EXCEEDED)

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

@@ -61,7 +61,7 @@ inline fun <R> rethrow(function: () -> R): R {
         return function()
     } catch (e: Exception) {
         throw e
-    } catch(e: Throwable) {
-        throw FirebaseFunctionsException(e.asDynamic().code as String?, e)
+    } catch(e: dynamic) {
+        throw FirebaseFunctionsException(e.code as String?, e)
     }
 }

gradle.properties

@@ -6,9 +6,9 @@ android.useAndroidX=true
 testOptions.unitTests.isIncludeAndroidResources = true
 
 # Versions:
-firebase-app.version=0.3.0
-firebase-auth.version=0.3.0
-firebase-common.version=0.3.0
-firebase-database.version=0.3.0
-firebase-firestore.version=0.3.0
-firebase-functions.version=0.3.0
+firebase-app.version=0.3.1
+firebase-auth.version=0.3.1
+firebase-common.version=0.3.1
+firebase-database.version=0.3.1
+firebase-firestore.version=0.3.1
+firebase-functions.version=0.3.1