Skip to content

Commit f68ed14

Browse files
committed
fix: package.swift consistency
1 parent 784235d commit f68ed14

File tree

1 file changed

+3
-24
lines changed
  • packages/firebase_core/firebase_core/ios/firebase_core

1 file changed

+3
-24
lines changed

packages/firebase_core/firebase_core/ios/firebase_core/Package.swift

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ func loadFirebaseSDKVersion() throws -> String {
6868

6969
let library_version_string: String
7070
let firebase_sdk_version_string: String
71-
let shared_spm_tag = "-firebase-core-swift"
7271

7372
do {
7473
library_version_string = try loadPubspecVersion()
@@ -81,12 +80,6 @@ guard let firebase_sdk_version = Version(firebase_sdk_version_string) else {
8180
fatalError("Invalid Firebase SDK version: \(firebase_sdk_version_string)")
8281
}
8382

84-
// TODO: - we can try using existing firebase_core tag once flutterfire/Package.swift is part of release cycle
85-
// but I don't think it'll work as Swift versioning requires version-[tag name]
86-
guard let shared_spm_version = Version("\(library_version_string)\(shared_spm_tag)") else {
87-
fatalError("Invalid firebase_core version: \(library_version_string)\(shared_spm_tag)")
88-
}
89-
9083
let package = Package(
9184
name: "firebase_core",
9285
platforms: [
@@ -97,34 +90,20 @@ let package = Package(
9790
],
9891
dependencies: [
9992
.package(url: "https://github.com/firebase/firebase-ios-sdk", from: firebase_sdk_version),
100-
.package(url: "https://github.com/firebase/flutterfire", exact: shared_spm_version),
10193
],
10294
targets: [
10395
.target(
10496
name: "firebase_core",
10597
dependencies: [
10698
// No product for firebase-core so we pull in the smallest one
10799
.product(name: "FirebaseInstallations", package: "firebase-ios-sdk"),
108-
.product(name: "firebase-core-shared", package: "flutterfire"),
109-
],
110-
exclude: [
111-
// These are now pulled in as a remote dependency from FlutterFire repo
112-
"FLTFirebaseCorePlugin.m",
113-
"FLTFirebasePlugin.m",
114-
"FLTFirebasePluginRegistry.m",
115-
"messages.g.m",
116-
"include/firebase_core/FLTFirebaseCorePlugin.h",
117-
"include/firebase_core/messages.g.h",
118-
"include/firebase_core/FLTFirebasePlugin.h",
119-
"include/firebase_core/FLTFirebasePluginRegistry.h",
120100
],
121101
resources: [
122102
.process("Resources"),
123103
],
124-
cSettings: [
125-
.headerSearchPath("include/firebase_core"),
126-
.define("LIBRARY_VERSION", to: "\"\(library_version_string)\""),
127-
.define("LIBRARY_NAME", to: "\"flutter-fire-core\""),
104+
swiftSettings: [
105+
.define("LIBRARY_VERSION", to: library_version_string),
106+
.define("LIBRARY_NAME", to: "flutter-fire-core"),
128107
]
129108
),
130109
]

0 commit comments

Comments
 (0)