Merge remote-tracking branch 'origin/master' into upgrade-to-kotlin-1-3-7-0

nbransby · nbransby · commit 41e6002ba5a3 · 2020-03-16T13:02:36.000Z
diff --git a/firebase-app/src/iosMain/kotlin/dev/teamhub/firebase/firebase.kt b/firebase-app/src/iosMain/kotlin/dev/teamhub/firebase/firebase.kt
@@ -29,7 +29,8 @@ actual class FirebaseApp internal constructor(val ios: FIRApp) {
         get() = ios.options.run { FirebaseOptions(bundleID, APIKey!!, databaseURL!!, trackingID, storageBucket, projectID) }
 }
 
-actual fun Firebase.apps(context: Any?) = FIRApp.allApps()!!
+actual fun Firebase.apps(context: Any?) = FIRApp.allApps()
+    .orEmpty()
     .values
     .map { FirebaseApp(it as FIRApp) }
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@ actual class FirebaseApp internal constructor(val ios: FIRApp) {`
`29`	`29`	`get() = ios.options.run { FirebaseOptions(bundleID, APIKey!!, databaseURL!!, trackingID, storageBucket, projectID) }`
`30`	`30`	`}`
`31`	`31`
`32`		`-actual fun Firebase.apps(context: Any?) = FIRApp.allApps()!!`
	`32`	`+actual fun Firebase.apps(context: Any?) = FIRApp.allApps()`
	`33`	`+ .orEmpty()`
`33`	`34`	`.values`
`34`	`35`	`.map { FirebaseApp(it as FIRApp) }`
`35`	`36`