Visitar URL original
fix(core): auth Swift support requires `FLTFirebaseCorePlugin` & `mes… · firebase/flutterfire@f89483c · GitHub
Skip to content

Commit f89483c

Browse files
russellwheatleyLyokone
russellwheatley
authored and
Lyokone
committed
fix(core): auth Swift support requires FLTFirebaseCorePlugin & messages to be shared (#16774)
1 parent d5778f8 commit f89483c

13 files changed

Lines changed: 118 additions & 3 deletions

File tree

‎Package.swift‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
import Foundation
99
import PackageDescription
1010

11+
// auto-generated by melos post commit hook script
12+
let firebase_core_version: String = "3.8.0"
13+
let firebase_ios_sdk_version: String = "11.4.0"
14+
1115
// Shared Swift package manager code for firebase core
1216
let package = Package(
1317
name: "remote_firebase_core",
@@ -21,7 +25,10 @@ let package = Package(
2125
dependencies: [
2226
// TODO: this is fine for now, but will require a way of retrieving the firebase-ios-sdk
2327
// likely create a script that runs in preCommit hook of melos
24-
.package(url: "https://github.com/firebase/firebase-ios-sdk", from: "11.0.0"),
28+
.package(
29+
url: "https://github.com/firebase/firebase-ios-sdk",
30+
from: Version(firebase_ios_sdk_version)!
31+
),
2532
],
2633
targets: [
2734
.target(
@@ -30,7 +37,12 @@ let package = Package(
3037
.product(name: "FirebaseInstallations", package: "firebase-ios-sdk"),
3138
],
3239
path: "Sources/firebase_core_shared",
33-
publicHeadersPath: "include"
40+
publicHeadersPath: "include",
41+
cSettings: [
42+
.headerSearchPath("include/firebase_core"),
43+
.define("LIBRARY_VERSION", to: "\"\(firebase_core_version)\""),
44+
.define("LIBRARY_NAME", to: "\"flutter-fire-core\""),
45+
]
3446
),
3547
]
3648
)

‎Sources/firebase_core_shared/FLTFirebaseCorePlugin.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../packages/firebase_core/firebase_core/ios/firebase_core/Sources/firebase_core/FLTFirebaseCorePlugin.m

‎Sources/firebase_core_shared/include/FLTFirebaseCorePlugin.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../packages/firebase_core/firebase_core/ios/firebase_core/Sources/firebase_core/include/firebase_core/FLTFirebaseCorePlugin.h

‎Sources/firebase_core_shared/include/messages.g.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../packages/firebase_core/firebase_core/ios/firebase_core/Sources/firebase_core/include/firebase_core/messages.g.h

‎Sources/firebase_core_shared/messages.g.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../packages/firebase_core/firebase_core/ios/firebase_core/Sources/firebase_core/messages.g.m

‎melos.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ command:
1919
preCommit: |
2020
dart run scripts/generate_vertexai_version.dart && \
2121
dart run scripts/generate_dataconnect_version.dart && \
22-
dart run scripts/generate_ios_sdk_version_txt_spm.dart && \
22+
dart run scripts/generate_versions_spm.dart && \
2323
git add packages/firebase_vertexai/firebase_vertexai/lib/src/vertex_version.dart && \
2424
git add packages/firebase_data_connect/firebase_data_connect/lib/src/dataconnect_version.dart
2525
post: |

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,12 @@ let package = Package(
109109
],
110110
exclude: [
111111
// These are now pulled in as a remote dependency from FlutterFire repo
112+
"FLTFirebaseCorePlugin.m",
112113
"FLTFirebasePlugin.m",
113114
"FLTFirebasePluginRegistry.m",
115+
"messages.g.m",
116+
"include/firebase_core/FLTFirebaseCorePlugin.h",
117+
"include/firebase_core/messages.g.h",
114118
"include/firebase_core/FLTFirebasePlugin.h",
115119
"include/firebase_core/FLTFirebasePluginRegistry.h",
116120
],

‎packages/firebase_core/firebase_core/ios/firebase_core/Sources/firebase_core/FLTFirebaseCorePlugin.m‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,23 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
#if __has_include("include/firebase_core/FLTFirebaseCorePlugin.h")
56
#import "include/firebase_core/FLTFirebaseCorePlugin.h"
7+
#else
8+
#import "include/FLTFirebaseCorePlugin.h"
9+
#endif
10+
11+
#if __has_include("include/firebase_core/FLTFirebasePluginRegistry.h")
612
#import "include/firebase_core/FLTFirebasePluginRegistry.h"
13+
#else
14+
#import "include/FLTFirebasePluginRegistry.h"
15+
#endif
16+
17+
#if __has_include("include/firebase_core/messages.g.h")
718
#import "include/firebase_core/messages.g.h"
19+
#else
20+
#import "include/messages.g.h"
21+
#endif
822

923
@implementation FLTFirebaseCorePlugin {
1024
BOOL _coreInitialized;

‎packages/firebase_core/firebase_core/ios/firebase_core/Sources/firebase_core/dummy.m‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// Copyright 2023, the Chromium project authors. Please see the AUTHORS file
2+
// for details. All rights reserved. Use of this source code is governed by a
3+
// BSD-style license that can be found in the LICENSE file.

‎packages/firebase_core/firebase_core/ios/firebase_core/Sources/firebase_core/include/firebase_core/FLTFirebaseCorePlugin.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
#endif
1111

1212
#import "FLTFirebasePlugin.h"
13+
#if __has_include("include/messages.g.h")
14+
#import "include/messages.g.h"
15+
#else
1316
#import "messages.g.h"
17+
#endif
1418

1519
@interface FLTFirebaseCorePlugin
1620
: FLTFirebasePlugin <FlutterPlugin, FLTFirebasePlugin, FirebaseCoreHostApi, FirebaseAppHostApi>

0 commit comments

Comments
 (0)