Skip to content

Commit ce594e4

Browse files
authored
Merge pull request GitLiveApp#379 from walkingbrad/brad/ios_constructors
Re-enable ios constructors
2 parents 9e9d68b + 6a8bd95 commit ce594e4

File tree

10 files changed

+27
-29
lines changed
  • firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth
  • firebase-common/src/jsMain/kotlin/dev/gitlive/firebase
  • 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
  • firebase-installations/src/iosMain/kotlin/dev/gitlive/firebase/installations

10 files changed

+27
-29
lines changed

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

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

22-
actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth = TODO("Come back to issue")
23-
// FirebaseAuth(FIRAuth.authWithApp(app.ios))
22+
actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth = FirebaseAuth(
23+
FIRAuth.authWithApp(app.ios as objcnames.classes.FIRApp)
24+
)
2425

2526
actual class FirebaseAuth internal constructor(val ios: FIRAuth) {
2627

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ external object firebase {
276276
object functions {
277277
class Functions {
278278
fun httpsCallable(name: String, options: Json?): HttpsCallable
279-
fun useFunctionsEmulator(origin: String)
280279
fun useEmulator(host: String, port: Int)
281280
}
282281
interface HttpsCallableResult {

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 = TODO("Come back to issue")
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 = TODO("Come back to issue")
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 = TODO("Come back to issue")
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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +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 = TODO("Come back to issue")
25-
//actual fun Firebase.firestore(app: FirebaseApp): FirebaseFirestore {
26-
// return FirebaseFirestore(FIRFirestore.firestoreForApp(app.ios))
27-
//}
24+
actual fun Firebase.firestore(app: FirebaseApp): FirebaseFirestore = FirebaseFirestore(
25+
FIRFirestore.firestoreForApp(app.ios as objcnames.classes.FIRApp)
26+
)
2827

2928
@Suppress("UNCHECKED_CAST")
3029
actual class FirebaseFirestore(val ios: FIRFirestore) {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ actual class FirebaseFunctions internal constructor(val android: com.google.fire
2929
actual fun httpsCallable(name: String, timeout: Long?) =
3030
HttpsCallableReference(android.getHttpsCallable(name).apply { timeout?.let { setTimeout(it, TimeUnit.MILLISECONDS) } })
3131

32-
actual fun useFunctionsEmulator(origin: String) = android.useFunctionsEmulator(origin)
33-
3432
actual fun useEmulator(host: String, port: Int) = android.useEmulator(host, port)
3533
}
3634

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ import kotlinx.serialization.SerializationStrategy
1313
expect class FirebaseFunctions {
1414
fun httpsCallable(name: String, timeout: Long? = null): HttpsCallableReference
1515
fun useEmulator(host: String, port: Int)
16-
17-
@Deprecated("Use useEmulator(java.lang.String,int) to connect to the emulator.")
18-
fun useFunctionsEmulator(origin: String)
1916
}
2017

2118
expect class HttpsCallableReference {

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,21 @@ 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 = TODO("Come back to issue")
25-
// FirebaseFunctions(FIRFunctions.functionsForApp(app.ios))
24+
actual fun Firebase.functions(app: FirebaseApp): FirebaseFunctions = FirebaseFunctions(
25+
FIRFunctions.functionsForApp(app.ios as objcnames.classes.FIRApp)
26+
)
2627

27-
actual fun Firebase.functions(app: FirebaseApp, region: String): FirebaseFunctions = TODO("Come back to issue")
28-
// FirebaseFunctions(FIRFunctions.functionsForApp(app.ios, region = region))
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?) =
3237
HttpsCallableReference(ios.HTTPSCallableWithName(name).apply { timeout?.let { setTimeoutInterval(it/1000.0) } })
3338

34-
actual fun useFunctionsEmulator(origin: String): Unit = TODO("Come back to issue")
35-
//ios.useFunctionsEmulatorOrigin(origin)
36-
3739
actual fun useEmulator(host: String, port: Int) = ios.useEmulatorWithHost(host, port.toLong())
3840
}
3941

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ actual class FirebaseFunctions internal constructor(val js: firebase.functions.F
2626
actual fun httpsCallable(name: String, timeout: Long?) =
2727
rethrow { HttpsCallableReference(js.httpsCallable(name, timeout?.let { json("timeout" to timeout.toDouble()) })) }
2828

29-
actual fun useFunctionsEmulator(origin: String) = js.useFunctionsEmulator(origin)
30-
3129
actual fun useEmulator(host: String, port: Int) = js.useEmulator(host, port)
3230
}
3331

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 = TODO("Come back to issue")
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)