Updated iOS exceptions to print better

litclimbing · litclimbing · commit 17837a1eeedf · 2022-01-13T12:49:42.000-07:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,7 +17,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.1")
+        classpath("com.android.tools.build:gradle:7.0.4")
         classpath("com.adarshr:gradle-test-logger-plugin:2.1.1")
     }
 }
@@ -49,6 +49,9 @@ subprojects {
         mavenLocal()
         google()
         mavenCentral()
+        maven {
+            setUrl("https://maven.pkg.jetbrains.space/public/p/kotlinx-coroutines/maven")
+        }
     }
 
     tasks.withType<Sign>().configureEach {
@@ -195,9 +198,9 @@ subprojects {
         }
 
         dependencies {
-            "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
+            "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1-new-mm-dev2")
             "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.2")
-            "androidMainImplementation"(platform("com.google.firebase:firebase-bom:29.0.1"))
+            "androidMainImplementation"(platform("com.google.firebase:firebase-bom:29.0.3"))
             "commonTestImplementation"(kotlin("test-common"))
             "commonTestImplementation"(kotlin("test-annotations-common"))
             "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
diff --git a/firebase-app/package.json b/firebase-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-app",
-  "version": "1.0.0",
+  "version": "1.4.3",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-app.js",
   "scripts": {
diff --git a/firebase-app/src/nativeInterop/cinterop/Cartfile b/firebase-app/src/nativeInterop/cinterop/Cartfile
@@ -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.10.0
diff --git a/firebase-auth/package.json b/firebase-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-auth",
-  "version": "1.0.0",
+  "version": "1.4.3",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-auth.js",
   "scripts": {
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
@@ -175,9 +175,9 @@ internal suspend inline fun <T> T.await(function: T.(callback: (NSError?) -> Uni
 private fun NSError.toException() = when(domain) {
     FIRAuthErrorDomain -> when(code) {
         FIRAuthErrorCodeInvalidActionCode,
-        FIRAuthErrorCodeExpiredActionCode -> FirebaseAuthActionCodeException(toString())
+        FIRAuthErrorCodeExpiredActionCode -> FirebaseAuthActionCodeException(localizedDescription)
 
-        FIRAuthErrorCodeInvalidEmail -> FirebaseAuthEmailException(toString())
+        FIRAuthErrorCodeInvalidEmail -> FirebaseAuthEmailException(localizedDescription)
 
         FIRAuthErrorCodeCaptchaCheckFailed,
         FIRAuthErrorCodeInvalidPhoneNumber,
@@ -187,26 +187,26 @@ private fun NSError.toException() = when(domain) {
         FIRAuthErrorCodeMissingVerificationID,
         FIRAuthErrorCodeMissingVerificationCode,
         FIRAuthErrorCodeWeakPassword,
-        FIRAuthErrorCodeInvalidCredential -> FirebaseAuthInvalidCredentialsException(toString())
+        FIRAuthErrorCodeInvalidCredential -> FirebaseAuthInvalidCredentialsException(localizedDescription)
 
-        FIRAuthErrorCodeInvalidUserToken -> FirebaseAuthInvalidUserException(toString())
+        FIRAuthErrorCodeInvalidUserToken -> FirebaseAuthInvalidUserException(localizedDescription)
 
-        FIRAuthErrorCodeRequiresRecentLogin -> FirebaseAuthRecentLoginRequiredException(toString())
+        FIRAuthErrorCodeRequiresRecentLogin -> FirebaseAuthRecentLoginRequiredException(localizedDescription)
 
         FIRAuthErrorCodeSecondFactorAlreadyEnrolled,
         FIRAuthErrorCodeSecondFactorRequired,
         FIRAuthErrorCodeMaximumSecondFactorCountExceeded,
-        FIRAuthErrorCodeMultiFactorInfoNotFound -> FirebaseAuthMultiFactorException(toString())
+        FIRAuthErrorCodeMultiFactorInfoNotFound -> FirebaseAuthMultiFactorException(localizedDescription)
 
         FIRAuthErrorCodeEmailAlreadyInUse,
         FIRAuthErrorCodeAccountExistsWithDifferentCredential,
-        FIRAuthErrorCodeCredentialAlreadyInUse -> FirebaseAuthUserCollisionException(toString())
+        FIRAuthErrorCodeCredentialAlreadyInUse -> FirebaseAuthUserCollisionException(localizedDescription)
 
         FIRAuthErrorCodeWebContextAlreadyPresented,
         FIRAuthErrorCodeWebContextCancelled,
-        FIRAuthErrorCodeWebInternalError -> FirebaseAuthWebException(toString())
+        FIRAuthErrorCodeWebInternalError -> FirebaseAuthWebException(localizedDescription)
 
-        else -> FirebaseAuthException(toString())
+        else -> FirebaseAuthException(localizedDescription)
     }
-    else -> FirebaseAuthException(toString())
+    else -> FirebaseAuthException(localizedDescription)
 }
diff --git a/firebase-auth/src/nativeInterop/cinterop/Cartfile b/firebase-auth/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 8.8.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 8.10.0
diff --git a/firebase-common/package.json b/firebase-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-common",
-  "version": "1.0.0",
+  "version": "1.4.3",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-common.js",
   "scripts": {
diff --git a/firebase-config/package.json b/firebase-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-config",
-  "version": "1.0.0",
+  "version": "1.4.3",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-config.js",
   "scripts": {
diff --git a/firebase-config/src/nativeInterop/cinterop/Cartfile b/firebase-config/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinary.json" == 8.8.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinary.json" == 8.10.0
diff --git a/firebase-database/package.json b/firebase-database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-database",
-  "version": "1.0.0",
+  "version": "1.4.3",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-database.js",
   "scripts": {
diff --git a/firebase-database/src/nativeInterop/cinterop/Cartfile b/firebase-database/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json" == 8.8.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json" == 8.10.0
diff --git a/firebase-firestore/package.json b/firebase-firestore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-firestore",
-  "version": "1.0.0",
+  "version": "1.4.3",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-firestore.js",
   "scripts": {
diff --git a/firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -312,7 +312,7 @@ actual open class Query(open val ios: FIRQuery) {
 
     internal actual fun _where(path: FieldPath, inArray: List<Any>?, arrayContainsAny: List<Any>?) = Query(
         (inArray?.let { ios.queryWhereFieldPath(path.ios, `in` = it) } ?: ios).let { ios2 ->
-            arrayContainsAny?.let { ios2.queryWhereFieldPath(path.ios, arrayContainsAny = arrayContainsAny) } ?: ios2
+            arrayContainsAny?.let { ios2.queryWhereFieldPath(path.ios, arrayContainsAny = arrayContainsAny) } ?: ios
         }
     )
 
@@ -408,7 +408,7 @@ fun NSError.toException() = when(domain) {
         else -> FirestoreExceptionCode.UNKNOWN
     }
     else -> FirestoreExceptionCode.UNKNOWN
-}.let { FirebaseFirestoreException(description!!, it) }
+}.let { FirebaseFirestoreException(localizedDescription!!, it) }
 
 actual class QuerySnapshot(val ios: FIRQuerySnapshot) {
     actual val documents
diff --git a/firebase-firestore/src/nativeInterop/cinterop/Cartfile b/firebase-firestore/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json" == 8.8.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json" == 8.10.0
diff --git a/firebase-functions/package.json b/firebase-functions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-functions",
-  "version": "1.0.0",
+  "version": "1.4.3",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-functions.js",
   "scripts": {
diff --git a/firebase-functions/src/nativeInterop/cinterop/Cartfile b/firebase-functions/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json" == 8.8.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json" == 8.10.0
diff --git a/gradle.properties b/gradle.properties
@@ -9,6 +9,7 @@ kotlin.js.experimental.generateKotlinExternals=false
 #kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.stability.nowarn=true
 kotlin.native.cacheKind.iosX64=none
+kotlin.native.binary.memoryModel=experimental
 #kotlin.native.enableDependencyPropagation=false
 kotlin.native.enableParallelExecutionCheck=false
 kotlin.setJvmTargetFromAndroidCompileOptions=true

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ buildscript {`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`dependencies {`
`20`		`- classpath("com.android.tools.build:gradle:7.0.1")`
	`20`	`+ classpath("com.android.tools.build:gradle:7.0.4")`
`21`	`21`	`classpath("com.adarshr:gradle-test-logger-plugin:2.1.1")`
`22`	`22`	`}`
`23`	`23`	`}`
`@@ -49,6 +49,9 @@ subprojects {`
`49`	`49`	`mavenLocal()`
`50`	`50`	`google()`
`51`	`51`	`mavenCentral()`
	`52`	`+ maven {`
	`53`	`+ setUrl("https://maven.pkg.jetbrains.space/public/p/kotlinx-coroutines/maven")`
	`54`	`+ }`
`52`	`55`	`}`
`53`	`56`
`54`	`57`	`tasks.withType<Sign>().configureEach {`
`@@ -195,9 +198,9 @@ subprojects {`
`195`	`198`	`}`
`196`	`199`
`197`	`200`	`dependencies {`
`198`		`- "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")`
	`201`	`+ "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1-new-mm-dev2")`
`199`	`202`	`"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.2")`
`200`		`- "androidMainImplementation"(platform("com.google.firebase:firebase-bom:29.0.1"))`
	`203`	`+ "androidMainImplementation"(platform("com.google.firebase:firebase-bom:29.0.3"))`
`201`	`204`	`"commonTestImplementation"(kotlin("test-common"))`
`202`	`205`	`"commonTestImplementation"(kotlin("test-annotations-common"))`
`203`	`206`	`"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitlive/firebase-app",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.4.3",`
`4`	`4`	`"description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",`
`5`	`5`	`"main": "firebase-app.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.8.0`
	`1`	`+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.10.0`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitlive/firebase-auth",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.4.3",`
`4`	`4`	`"description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",`
`5`	`5`	`"main": "firebase-auth.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitlive/firebase-common",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.4.3",`
`4`	`4`	`"description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",`
`5`	`5`	`"main": "firebase-common.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitlive/firebase-config",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.4.3",`
`4`	`4`	`"description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",`
`5`	`5`	`"main": "firebase-config.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitlive/firebase-database",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.4.3",`
`4`	`4`	`"description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",`
`5`	`5`	`"main": "firebase-database.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitlive/firebase-firestore",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.4.3",`
`4`	`4`	`"description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",`
`5`	`5`	`"main": "firebase-firestore.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@ actual open class Query(open val ios: FIRQuery) {`
`312`	`312`
`313`	`313`	`internal actual fun _where(path: FieldPath, inArray: List<Any>?, arrayContainsAny: List<Any>?) = Query(`
`314`	`314`	(inArray?.let { ios.queryWhereFieldPath(path.ios, `in` = it) } ?: ios).let { ios2 ->
`315`		`- arrayContainsAny?.let { ios2.queryWhereFieldPath(path.ios, arrayContainsAny = arrayContainsAny) } ?: ios2`
	`315`	`+ arrayContainsAny?.let { ios2.queryWhereFieldPath(path.ios, arrayContainsAny = arrayContainsAny) } ?: ios`
`316`	`316`	`}`
`317`	`317`	`)`
`318`	`318`
`@@ -408,7 +408,7 @@ fun NSError.toException() = when(domain) {`
`408`	`408`	`else -> FirestoreExceptionCode.UNKNOWN`
`409`	`409`	`}`
`410`	`410`	`else -> FirestoreExceptionCode.UNKNOWN`
`411`		`-}.let { FirebaseFirestoreException(description!!, it) }`
	`411`	`+}.let { FirebaseFirestoreException(localizedDescription!!, it) }`
`412`	`412`
`413`	`413`	`actual class QuerySnapshot(val ios: FIRQuerySnapshot) {`
`414`	`414`	`actual val documents`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitlive/firebase-functions",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.4.3",`
`4`	`4`	`"description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",`
`5`	`5`	`"main": "firebase-functions.js",`
`6`	`6`	`"scripts": {`