Skip to content

Commit 803f2cc

Browse files
committed
FirebaseCore: port to android
This adjusts the API usage to account for signature differences on Android. This is the first step towards setting up the android port.
1 parent 91335e0 commit 803f2cc

File tree

2 files changed

+34
-1
lines changed

2 files changed

+34
-1
lines changed

Sources/FirebaseCore/FirebaseApp+Swift.swift

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,39 @@
33
@_exported
44
import firebase
55

6+
#if os(Android)
7+
private import FirebaseAndroid
8+
#endif
9+
610
public typealias FirebaseApp = UnsafeMutablePointer<firebase.App>
711

812
extension FirebaseApp {
913
public static func configure() {
14+
#if os(Android)
15+
_ = firebase.App.Create(SwiftFirebase_GetJavaEnvironment(),
16+
SwiftFirebase_GetActivity())
17+
#else
1018
_ = firebase.App.Create()
19+
#endif
1120
}
1221

1322
public static func configure(options: FirebaseOptions) {
23+
#if os(Android)
24+
_ = firebase.App.Create(options.pointee, SwiftFirebase_GetJavaEnvironment(),
25+
SwiftFirebase_GetActivity())
26+
#else
1427
_ = firebase.App.Create(options.pointee)
28+
#endif
1529
}
1630

1731
public static func configure(name: String, options: FirebaseOptions) {
32+
#if os(Android)
33+
_ = firebase.App.Create(options.pointee, name,
34+
SwiftFirebase_GetJavaEnvironment(),
35+
SwiftFirebase_GetActivity())
36+
#else
1837
_ = firebase.App.Create(options.pointee, name)
38+
#endif
1939
}
2040

2141
public static func app() -> FirebaseApp? {

Sources/FirebaseCore/FirebaseOptions+Swift.swift

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
@_exported
44
import firebase
55

6+
#if os(Android)
7+
private import FirebaseAndroid
8+
#endif
9+
610
import Foundation
711

812
public typealias FirebaseOptions = UnsafeMutablePointer<firebase.AppOptions>
@@ -27,7 +31,16 @@ extension firebase.AppOptions: CustomDebugStringConvertible {
2731

2832
extension FirebaseOptions {
2933
public static func defaultOptions() -> FirebaseOptions {
30-
guard let options = firebase.AppOptions.LoadDefault(nil) else {
34+
#if os(Android)
35+
let options =
36+
firebase.AppOptions.LoadDefault(nil,
37+
SwiftFirebase_GetJavaEnvironment(),
38+
SwiftFirebase_GetActivity())
39+
#else
40+
let options = firebase.AppOptions.LoadDefault(nil)
41+
#endif
42+
43+
guard let options else {
3144
fatalError("unable to deserialise firebase options")
3245
}
3346
return options

0 commit comments

Comments
 (0)