Skip to content

Commit 6a8bd95

Browse files
committed
Cast to objcnames.classes.FIRApp
1 parent be87ed7 commit 6a8bd95

File tree

6 files changed

+28
-16
lines changed
  • firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth
  • firebase-config/src/iosMain/kotlin/dev/gitlive/firebase/remoteconfig
  • firebase-database/src/iosMain/kotlin/dev/gitlive/firebase/database
  • firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore
  • firebase-functions/src/iosMain/kotlin/dev/gitlive/firebase/functions
  • firebase-installations/src/iosMain/kotlin/dev/gitlive/firebase/installations

6 files changed

+28
-16
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ import platform.Foundation.*
1919
actual val Firebase.auth
2020
get() = FirebaseAuth(FIRAuth.auth())
2121

22-
actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth = FirebaseAuth(FIRAuth.authWithApp(app.ios))
22+
actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth = FirebaseAuth(
23+
FIRAuth.authWithApp(app.ios as objcnames.classes.FIRApp)
24+
)
2325

2426
actual class FirebaseAuth internal constructor(val ios: FIRAuth) {
2527

firebase-config/src/iosMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ import platform.Foundation.timeIntervalSince1970
1919
actual val Firebase.remoteConfig: FirebaseRemoteConfig
2020
get() = FirebaseRemoteConfig(FIRRemoteConfig.remoteConfig())
2121

22-
actual fun Firebase.remoteConfig(app: FirebaseApp): FirebaseRemoteConfig =
23-
FirebaseRemoteConfig(FIRRemoteConfig.remoteConfigWithApp(Firebase.app.ios))
22+
actual fun Firebase.remoteConfig(app: FirebaseApp): FirebaseRemoteConfig = FirebaseRemoteConfig(
23+
FIRRemoteConfig.remoteConfigWithApp(Firebase.app.ios as objcnames.classes.FIRApp)
24+
)
2425

2526
actual class FirebaseRemoteConfig internal constructor(val ios: FIRRemoteConfig) {
2627
actual val all: Map<String, FirebaseRemoteConfigValue>

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ actual val Firebase.database
3333
actual fun Firebase.database(url: String) =
3434
FirebaseDatabase(FIRDatabase.databaseWithURL(url))
3535

36-
actual fun Firebase.database(app: FirebaseApp): FirebaseDatabase =
37-
FirebaseDatabase(FIRDatabase.databaseForApp(app.ios))
36+
actual fun Firebase.database(app: FirebaseApp): FirebaseDatabase = FirebaseDatabase(
37+
FIRDatabase.databaseForApp(app.ios as objcnames.classes.FIRApp)
38+
)
3839

39-
actual fun Firebase.database(app: FirebaseApp, url: String): FirebaseDatabase =
40-
FirebaseDatabase(FIRDatabase.databaseForApp(app.ios, url))
40+
actual fun Firebase.database(app: FirebaseApp, url: String): FirebaseDatabase = FirebaseDatabase(
41+
FIRDatabase.databaseForApp(app.ios as objcnames.classes.FIRApp, url)
42+
)
4143

4244
actual class FirebaseDatabase internal constructor(val ios: FIRDatabase) {
4345

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ import platform.Foundation.NSNull
2121
actual val Firebase.firestore get() =
2222
FirebaseFirestore(FIRFirestore.firestore())
2323

24-
actual fun Firebase.firestore(app: FirebaseApp): FirebaseFirestore =
25-
FirebaseFirestore(FIRFirestore.firestoreForApp(app.ios))
24+
actual fun Firebase.firestore(app: FirebaseApp): FirebaseFirestore = FirebaseFirestore(
25+
FIRFirestore.firestoreForApp(app.ios as objcnames.classes.FIRApp)
26+
)
2627

2728
@Suppress("UNCHECKED_CAST")
2829
actual class FirebaseFirestore(val ios: FIRFirestore) {

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,16 @@ actual val Firebase.functions
2121
actual fun Firebase.functions(region: String) =
2222
FirebaseFunctions(FIRFunctions.functionsForRegion(region))
2323

24-
actual fun Firebase.functions(app: FirebaseApp): FirebaseFunctions =
25-
FirebaseFunctions(FIRFunctions.functionsForApp(app.ios))
26-
27-
actual fun Firebase.functions(app: FirebaseApp, region: String): FirebaseFunctions =
28-
FirebaseFunctions(FIRFunctions.functionsForApp(app.ios, region = region))
24+
actual fun Firebase.functions(app: FirebaseApp): FirebaseFunctions = FirebaseFunctions(
25+
FIRFunctions.functionsForApp(app.ios as objcnames.classes.FIRApp)
26+
)
27+
28+
actual fun Firebase.functions(
29+
app: FirebaseApp,
30+
region: String,
31+
): FirebaseFunctions = FirebaseFunctions(
32+
FIRFunctions.functionsForApp(app.ios as objcnames.classes.FIRApp, region = region)
33+
)
2934

3035
actual class FirebaseFunctions internal constructor(val ios: FIRFunctions) {
3136
actual fun httpsCallable(name: String, timeout: Long?) =

firebase-installations/src/iosMain/kotlin/dev/gitlive/firebase/installations/installations.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ import platform.Foundation.*
1010
actual val Firebase.installations
1111
get() = FirebaseInstallations(FIRInstallations.installations())
1212

13-
actual fun Firebase.installations(app: FirebaseApp): FirebaseInstallations =
14-
FirebaseInstallations(FIRInstallations.installationsWithApp(app.ios))
13+
actual fun Firebase.installations(app: FirebaseApp): FirebaseInstallations = FirebaseInstallations(
14+
FIRInstallations.installationsWithApp(app.ios as objcnames.classes.FIRApp)
15+
)
1516

1617
actual class FirebaseInstallations internal constructor(val ios: FIRInstallations) {
1718

0 commit comments

Comments
 (0)