Skip to content

Re-enable ios constructors #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ import platform.Foundation.*
actual val Firebase.auth
get() = FirebaseAuth(FIRAuth.auth())

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ external object firebase {
object functions {
class Functions {
fun httpsCallable(name: String, options: Json?): HttpsCallable
fun useFunctionsEmulator(origin: String)
fun useEmulator(host: String, port: Int)
}
interface HttpsCallableResult {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ import platform.Foundation.timeIntervalSince1970
actual val Firebase.remoteConfig: FirebaseRemoteConfig
get() = FirebaseRemoteConfig(FIRRemoteConfig.remoteConfig())

actual fun Firebase.remoteConfig(app: FirebaseApp): FirebaseRemoteConfig = TODO("Come back to issue")
// FirebaseRemoteConfig(FIRRemoteConfig.remoteConfigWithApp(Firebase.app.ios))
actual fun Firebase.remoteConfig(app: FirebaseApp): FirebaseRemoteConfig = FirebaseRemoteConfig(
FIRRemoteConfig.remoteConfigWithApp(Firebase.app.ios as objcnames.classes.FIRApp)
)

actual class FirebaseRemoteConfig internal constructor(val ios: FIRRemoteConfig) {
actual val all: Map<String, FirebaseRemoteConfigValue>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,13 @@ actual val Firebase.database
actual fun Firebase.database(url: String) =
FirebaseDatabase(FIRDatabase.databaseWithURL(url))

actual fun Firebase.database(app: FirebaseApp): FirebaseDatabase = TODO("Come back to issue")
// FirebaseDatabase(FIRDatabase.databaseForApp(app.ios))
actual fun Firebase.database(app: FirebaseApp): FirebaseDatabase = FirebaseDatabase(
FIRDatabase.databaseForApp(app.ios as objcnames.classes.FIRApp)
)

actual fun Firebase.database(app: FirebaseApp, url: String): FirebaseDatabase = TODO("Come back to issue")
// FirebaseDatabase(FIRDatabase.databaseForApp(app.ios, url))
actual fun Firebase.database(app: FirebaseApp, url: String): FirebaseDatabase = FirebaseDatabase(
FIRDatabase.databaseForApp(app.ios as objcnames.classes.FIRApp, url)
)

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ import platform.Foundation.NSNull
actual val Firebase.firestore get() =
FirebaseFirestore(FIRFirestore.firestore())

actual fun Firebase.firestore(app: FirebaseApp): FirebaseFirestore = TODO("Come back to issue")
//actual fun Firebase.firestore(app: FirebaseApp): FirebaseFirestore {
// return FirebaseFirestore(FIRFirestore.firestoreForApp(app.ios))
//}
actual fun Firebase.firestore(app: FirebaseApp): FirebaseFirestore = FirebaseFirestore(
FIRFirestore.firestoreForApp(app.ios as objcnames.classes.FIRApp)
)

@Suppress("UNCHECKED_CAST")
actual class FirebaseFirestore(val ios: FIRFirestore) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ actual class FirebaseFunctions internal constructor(val android: com.google.fire
actual fun httpsCallable(name: String, timeout: Long?) =
HttpsCallableReference(android.getHttpsCallable(name).apply { timeout?.let { setTimeout(it, TimeUnit.MILLISECONDS) } })

actual fun useFunctionsEmulator(origin: String) = android.useFunctionsEmulator(origin)

actual fun useEmulator(host: String, port: Int) = android.useEmulator(host, port)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ import kotlinx.serialization.SerializationStrategy
expect class FirebaseFunctions {
fun httpsCallable(name: String, timeout: Long? = null): HttpsCallableReference
fun useEmulator(host: String, port: Int)

@Deprecated("Use useEmulator(java.lang.String,int) to connect to the emulator.")
fun useFunctionsEmulator(origin: String)
}

expect class HttpsCallableReference {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,21 @@ actual val Firebase.functions
actual fun Firebase.functions(region: String) =
FirebaseFunctions(FIRFunctions.functionsForRegion(region))

actual fun Firebase.functions(app: FirebaseApp): FirebaseFunctions = TODO("Come back to issue")
// FirebaseFunctions(FIRFunctions.functionsForApp(app.ios))
actual fun Firebase.functions(app: FirebaseApp): FirebaseFunctions = FirebaseFunctions(
FIRFunctions.functionsForApp(app.ios as objcnames.classes.FIRApp)
)

actual fun Firebase.functions(app: FirebaseApp, region: String): FirebaseFunctions = TODO("Come back to issue")
// FirebaseFunctions(FIRFunctions.functionsForApp(app.ios, region = region))
actual fun Firebase.functions(
app: FirebaseApp,
region: String,
): FirebaseFunctions = FirebaseFunctions(
FIRFunctions.functionsForApp(app.ios as objcnames.classes.FIRApp, region = region)
)

actual class FirebaseFunctions internal constructor(val ios: FIRFunctions) {
actual fun httpsCallable(name: String, timeout: Long?) =
HttpsCallableReference(ios.HTTPSCallableWithName(name).apply { timeout?.let { setTimeoutInterval(it/1000.0) } })

actual fun useFunctionsEmulator(origin: String): Unit = TODO("Come back to issue")
//ios.useFunctionsEmulatorOrigin(origin)

actual fun useEmulator(host: String, port: Int) = ios.useEmulatorWithHost(host, port.toLong())
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ actual class FirebaseFunctions internal constructor(val js: firebase.functions.F
actual fun httpsCallable(name: String, timeout: Long?) =
rethrow { HttpsCallableReference(js.httpsCallable(name, timeout?.let { json("timeout" to timeout.toDouble()) })) }

actual fun useFunctionsEmulator(origin: String) = js.useFunctionsEmulator(origin)

actual fun useEmulator(host: String, port: Int) = js.useEmulator(host, port)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ import platform.Foundation.*
actual val Firebase.installations
get() = FirebaseInstallations(FIRInstallations.installations())

actual fun Firebase.installations(app: FirebaseApp) : FirebaseInstallations = TODO("Come back to issue")
// = FirebaseInstallations(FIRInstallations.installationsWithApp(app.ios))
actual fun Firebase.installations(app: FirebaseApp): FirebaseInstallations = FirebaseInstallations(
FIRInstallations.installationsWithApp(app.ios as objcnames.classes.FIRApp)
)

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

Expand Down