Skip to content

Commit bb73cdb

Browse files
committed
fix: conflicts
1 parent 3c89d95 commit bb73cdb

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

packages/firebase_database/firebase_database/ios/firebase_database/Package.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ let package = Package(
110110
.process("Resources"),
111111
],
112112
cSettings: [
113-
.headerSearchPath("include"),
114113
.define("LIBRARY_VERSION", to: "\"\(library_version)\""),
115114
.define("LIBRARY_NAME", to: "\"flutter-fire-rtdb\""),
116115
]

packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabasePlugin.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug
6363
binaryMessenger: messenger, api: instance
6464
)
6565

66-
FLTFirebasePluginRegistry.sharedInstance().register(instance)
66+
FLTFirebasePluginRegistry.sharedInstance().registerFirebasePlugin(instance)
6767

6868
#if !targetEnvironment(macCatalyst)
6969
registrar.publish(instance)
@@ -691,7 +691,7 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug
691691
return cachedInstance
692692
}
693693

694-
let firebaseApp = FLTFirebasePlugin.firebaseAppNamed(app.appName)!
694+
let firebaseApp = FLTFirebasePluginHelper.firebaseApp(named: app.appName)!
695695
let database: Database
696696

697697
if let databaseURL = app.databaseURL, !databaseURL.isEmpty {

packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseUtils.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import Foundation
3333
return cachedInstance
3434
}
3535

36-
let app = FLTFirebasePlugin.firebaseAppNamed(appName)!
36+
let app = FLTFirebasePluginHelper.firebaseApp(named: appName)!
3737
let database: Database
3838

3939
if databaseURL.isEmpty {

packages/firebase_database/firebase_database/macos/firebase_database/Package.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ let package = Package(
112112
.process("Resources"),
113113
],
114114
cSettings: [
115-
.headerSearchPath("include"),
116115
.define("LIBRARY_VERSION", to: "\"\(library_version)\""),
117116
.define("LIBRARY_NAME", to: "\"flutter-fire-rtdb\""),
118117
.define("SWIFT_PACKAGE"),

0 commit comments

Comments
 (0)