Skip to content

Commit be2835e

Browse files
morganchen12morganchen12
committed
fix build
1 parent 783ca6c commit be2835e

File tree

14 files changed

+211
-194
lines changed

14 files changed

+211
-194
lines changed

‎.github/workflows/sample.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
uses: actions/checkout@master
5252
- name: Setup
5353
run: |
54+
cp samples/GoogleService-Info-dummy.plist samples/swift/GoogleService-Info.plist
5455
cd samples/objc
5556
gem install bundler
5657
bundle install
@@ -59,6 +60,7 @@ jobs:
5960
- name: Build
6061
# Note: tests aren't run here because the ObjC sample has no test targets.
6162
run: |
63+
cp samples/GoogleService-Info-dummy.plist samples/objc/GoogleService-Info.plist
6264
cd samples/objc
6365
xcodebuild \
6466
-workspace FirebaseUI-demo-objc.xcworkspace \

‎FirebaseAuthUI.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
1717

1818
s.public_header_files = 'FirebaseAuthUI/Sources/Public/FirebaseAuthUI/*.h'
1919
s.source_files = 'FirebaseAuthUI/Sources/**/*.{h,m}'
20-
s.dependency 'Firebase/Auth', '>= 7.2.0'
20+
s.dependency 'Firebase/Auth', '~> 7.2.0'
2121
s.dependency 'FirebaseAuth'
2222
s.dependency 'FirebaseCore'
2323
s.dependency 'GoogleUtilities/UserDefaults'

‎FirebaseEmailAuthUI/FirebaseEmailAuthUI.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 51;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -491,21 +491,7 @@
491491
"@executable_path/Frameworks",
492492
"@loader_path/Frameworks",
493493
);
494-
OTHER_LDFLAGS = (
495-
"-ObjC",
496-
"-framework",
497-
"\"Foundation\"",
498-
"-framework",
499-
"\"GTMSessionFetcher\"",
500-
"-framework",
501-
"\"GoogleUtilities\"",
502-
"-framework",
503-
"\"SafariServices\"",
504-
"-framework",
505-
"\"Security\"",
506-
"-framework",
507-
"\"UIKit\"",
508-
);
494+
OTHER_LDFLAGS = "$(inherited)";
509495
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseEmailAuthUI;
510496
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
511497
SKIP_INSTALL = YES;
@@ -529,21 +515,7 @@
529515
"@executable_path/Frameworks",
530516
"@loader_path/Frameworks",
531517
);
532-
OTHER_LDFLAGS = (
533-
"-ObjC",
534-
"-framework",
535-
"\"Foundation\"",
536-
"-framework",
537-
"\"GTMSessionFetcher\"",
538-
"-framework",
539-
"\"GoogleUtilities\"",
540-
"-framework",
541-
"\"SafariServices\"",
542-
"-framework",
543-
"\"Security\"",
544-
"-framework",
545-
"\"UIKit\"",
546-
);
518+
OTHER_LDFLAGS = "$(inherited)";
547519
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseEmailAuthUI;
548520
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
549521
SKIP_INSTALL = YES;
@@ -570,22 +542,9 @@
570542
"${PODS_CONFIGURATION_BUILD_DIR}/OCMock",
571543
"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC",
572544
"${PODS_CONFIGURATION_BUILD_DIR}/nanopb",
545+
"$(PODS_CONFIGURATION_BUILD_DIR)/FirebaseAuthUI",
573546
);
574-
OTHER_LDFLAGS = (
575-
"-ObjC",
576-
"-framework",
577-
"\"Foundation\"",
578-
"-framework",
579-
"\"GTMSessionFetcher\"",
580-
"-framework",
581-
"\"GoogleUtilities\"",
582-
"-framework",
583-
"\"SafariServices\"",
584-
"-framework",
585-
"\"Security\"",
586-
"-framework",
587-
"\"UIKit\"",
588-
);
547+
OTHER_LDFLAGS = "$(inherited)";
589548
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseEmailAuthUITests;
590549
PRODUCT_NAME = "$(TARGET_NAME)";
591550
TARGETED_DEVICE_FAMILY = "1,2";
@@ -611,22 +570,9 @@
611570
"${PODS_CONFIGURATION_BUILD_DIR}/OCMock",
612571
"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC",
613572
"${PODS_CONFIGURATION_BUILD_DIR}/nanopb",
573+
"$(PODS_CONFIGURATION_BUILD_DIR)/FirebaseAuthUI",
614574
);
615-
OTHER_LDFLAGS = (
616-
"-ObjC",
617-
"-framework",
618-
"\"Foundation\"",
619-
"-framework",
620-
"\"GTMSessionFetcher\"",
621-
"-framework",
622-
"\"GoogleUtilities\"",
623-
"-framework",
624-
"\"SafariServices\"",
625-
"-framework",
626-
"\"Security\"",
627-
"-framework",
628-
"\"UIKit\"",
629-
);
575+
OTHER_LDFLAGS = "$(inherited)";
630576
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseEmailAuthUITests;
631577
PRODUCT_NAME = "$(TARGET_NAME)";
632578
TARGETED_DEVICE_FAMILY = "1,2";

‎FirebaseEmailAuthUI/Podfile.lock‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
PODS:
2-
- Firebase/Auth (8.0.0):
2+
- Firebase/Auth (7.2.0):
33
- Firebase/CoreOnly
4-
- FirebaseAuth (~> 8.0.0)
5-
- Firebase/CoreOnly (8.0.0):
6-
- FirebaseCore (= 8.0.0)
7-
- FirebaseAuth (8.0.0):
8-
- FirebaseCore (~> 8.0)
9-
- GoogleUtilities/AppDelegateSwizzler (~> 7.4)
10-
- GoogleUtilities/Environment (~> 7.4)
11-
- GTMSessionFetcher/Core (~> 1.5)
4+
- FirebaseAuth (~> 7.2.0)
5+
- Firebase/CoreOnly (7.2.0):
6+
- FirebaseCore (= 7.2.0)
7+
- FirebaseAuth (7.2.0):
8+
- FirebaseCore (~> 7.0)
9+
- GoogleUtilities/AppDelegateSwizzler (~> 7.0)
10+
- GoogleUtilities/Environment (~> 7.0)
11+
- GTMSessionFetcher/Core (~> 1.4)
1212
- FirebaseAuthUI (11.0.0):
13-
- Firebase/Auth (>= 7.2.0)
13+
- Firebase/Auth (~> 7.2.0)
14+
- FirebaseAuth
15+
- FirebaseCore
1416
- GoogleUtilities/UserDefaults
15-
- FirebaseCore (8.0.0):
16-
- FirebaseCoreDiagnostics (~> 8.0)
17-
- GoogleUtilities/Environment (~> 7.4)
18-
- GoogleUtilities/Logger (~> 7.4)
19-
- FirebaseCoreDiagnostics (8.0.0):
20-
- GoogleDataTransport (~> 9.0)
21-
- GoogleUtilities/Environment (~> 7.4)
22-
- GoogleUtilities/Logger (~> 7.4)
17+
- FirebaseCore (7.2.0):
18+
- FirebaseCoreDiagnostics (~> 7.0)
19+
- GoogleUtilities/Environment (~> 7.0)
20+
- GoogleUtilities/Logger (~> 7.0)
21+
- FirebaseCoreDiagnostics (7.11.0):
22+
- GoogleDataTransport (~> 8.4)
23+
- GoogleUtilities/Environment (~> 7.0)
24+
- GoogleUtilities/Logger (~> 7.0)
2325
- nanopb (~> 2.30908.0)
24-
- GoogleDataTransport (9.0.0):
26+
- GoogleDataTransport (8.4.0):
2527
- GoogleUtilities/Environment (~> 7.2)
2628
- nanopb (~> 2.30908.0)
2729
- PromisesObjC (~> 1.2)
@@ -73,12 +75,12 @@ EXTERNAL SOURCES:
7375
:path: "../"
7476

7577
SPEC CHECKSUMS:
76-
Firebase: 73c3e3b216ec1ecbc54d2ffdd4670c65c749edb1
77-
FirebaseAuth: b8cd992fca5b53dc6eec09e873a3f375f000c5a1
78-
FirebaseAuthUI: b3511544eeec97b719aeda7ccd779f7f0ff086d3
79-
FirebaseCore: 3f09591d51292843e2a46f18358d60bf4e996255
80-
FirebaseCoreDiagnostics: a31d987ba0fe16d59886a5dbadc2f1de871f88c8
81-
GoogleDataTransport: 11e3a5f2c190327df1a4a5d7e7ae3d4d5b9c9e4c
78+
Firebase: 456eeacc158d8c58586b7871619a81bb9f27d4ae
79+
FirebaseAuth: e6a214cc897d2eab7635b1e5dd6b4298fd1e776b
80+
FirebaseAuthUI: cf4fd21f00fe02a5a11e546eaba43e692563c5f8
81+
FirebaseCore: c959e8a598f83125c01c1700d9161b236ab3833c
82+
FirebaseCoreDiagnostics: 68ad972f99206cef818230f3f3179d52ccfb7f8c
83+
GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7
8284
GoogleUtilities: f8a43108b38a68eebe8b3540e1f4f2d28843ce20
8385
GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52
8486
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96

‎FirebaseEmailAuthUI/Sources/FUIEmailAuth.m‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,14 @@ - (BOOL)handleOpenURL:(NSURL *)URL sourceApplication:(nullable NSString *)source
256256
// Same device
257257
if (urlParameterDict[@"ui_pid"]) {
258258
// Unverified provider linking
259+
NSError *error = nil;
259260
[self handleUnverifiedProviderLinking:urlParameterDict[@"ui_pid"]
260-
email:localParameterDict[kEmailLinkSignInEmailKey]];
261+
email:localParameterDict[kEmailLinkSignInEmailKey]
262+
error:&error];
263+
if (error != nil) {
264+
NSLog(@"Error verifying provider linking: %@", error);
265+
return NO;
266+
}
261267
} else if (urlParameterDict[@"ui_auid"]) {
262268
// Anonymous upgrade
263269
[self handleAnonymousUpgrade:urlParameterDict[@"ui_auid"]
@@ -281,12 +287,21 @@ - (BOOL)handleOpenURL:(NSURL *)URL sourceApplication:(nullable NSString *)source
281287
}
282288

283289
- (void)handleUnverifiedProviderLinking:(NSString *)providerID
284-
email:(NSString *)email {
290+
email:(NSString *)email
291+
error:(NSError **)error {
285292
if ([providerID isEqualToString:FIRFacebookAuthProviderID]) {
286293
NSData *unverifiedProviderCredentialData = [GULUserDefaults.standardUserDefaults
287294
objectForKey:kEmailLinkSignInLinkingCredentialKey];
288-
FIRAuthCredential *unverifiedProviderCredential =
295+
FIRAuthCredential *unverifiedProviderCredential;
296+
297+
// TODO:
298+
// The replacement method for `unarchiveObjectWithData:` requires NSSecureCoding, which
299+
// FIRAuthCredential does not yet conform to.
300+
#pragma clang diagnostic push
301+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
302+
unverifiedProviderCredential =
289303
[NSKeyedUnarchiver unarchiveObjectWithData:unverifiedProviderCredentialData];
304+
#pragma clang diagnostic pop
290305

291306
FIRAuthCredential *emailLinkCredential =
292307
[FIREmailAuthProvider credentialWithEmail:email link:self.emailLink];

‎FirebaseFacebookAuthUI/FirebaseFacebookAuthUI.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 51;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -783,6 +783,7 @@
783783
"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"",
784784
"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
785785
"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
786+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/FirebaseAuthUI\"",
786787
);
787788
OTHER_LDFLAGS = (
788789
"$(inherited)",
@@ -832,6 +833,7 @@
832833
"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"",
833834
"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
834835
"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
836+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/FirebaseAuthUI\"",
835837
);
836838
OTHER_LDFLAGS = (
837839
"$(inherited)",

‎FirebaseFacebookAuthUI/Podfile.lock‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,31 @@ PODS:
99
- FBSDKLoginKit/Login (= 9.3.0)
1010
- FBSDKLoginKit/Login (9.3.0):
1111
- FBSDKCoreKit (~> 9.3.0)
12-
- Firebase/Auth (8.0.0):
12+
- Firebase/Auth (7.2.0):
1313
- Firebase/CoreOnly
14-
- FirebaseAuth (~> 8.0.0)
15-
- Firebase/CoreOnly (8.0.0):
16-
- FirebaseCore (= 8.0.0)
17-
- FirebaseAuth (8.0.0):
18-
- FirebaseCore (~> 8.0)
19-
- GoogleUtilities/AppDelegateSwizzler (~> 7.4)
20-
- GoogleUtilities/Environment (~> 7.4)
21-
- GTMSessionFetcher/Core (~> 1.5)
14+
- FirebaseAuth (~> 7.2.0)
15+
- Firebase/CoreOnly (7.2.0):
16+
- FirebaseCore (= 7.2.0)
17+
- FirebaseAuth (7.2.0):
18+
- FirebaseCore (~> 7.0)
19+
- GoogleUtilities/AppDelegateSwizzler (~> 7.0)
20+
- GoogleUtilities/Environment (~> 7.0)
21+
- GTMSessionFetcher/Core (~> 1.4)
2222
- FirebaseAuthUI (11.0.0):
23-
- Firebase/Auth (>= 7.2.0)
23+
- Firebase/Auth (~> 7.2.0)
24+
- FirebaseAuth
25+
- FirebaseCore
2426
- GoogleUtilities/UserDefaults
25-
- FirebaseCore (8.0.0):
26-
- FirebaseCoreDiagnostics (~> 8.0)
27-
- GoogleUtilities/Environment (~> 7.4)
28-
- GoogleUtilities/Logger (~> 7.4)
29-
- FirebaseCoreDiagnostics (8.0.0):
30-
- GoogleDataTransport (~> 9.0)
31-
- GoogleUtilities/Environment (~> 7.4)
32-
- GoogleUtilities/Logger (~> 7.4)
27+
- FirebaseCore (7.2.0):
28+
- FirebaseCoreDiagnostics (~> 7.0)
29+
- GoogleUtilities/Environment (~> 7.0)
30+
- GoogleUtilities/Logger (~> 7.0)
31+
- FirebaseCoreDiagnostics (7.11.0):
32+
- GoogleDataTransport (~> 8.4)
33+
- GoogleUtilities/Environment (~> 7.0)
34+
- GoogleUtilities/Logger (~> 7.0)
3335
- nanopb (~> 2.30908.0)
34-
- GoogleDataTransport (9.0.0):
36+
- GoogleDataTransport (8.4.0):
3537
- GoogleUtilities/Environment (~> 7.2)
3638
- nanopb (~> 2.30908.0)
3739
- PromisesObjC (~> 1.2)
@@ -89,12 +91,12 @@ EXTERNAL SOURCES:
8991
SPEC CHECKSUMS:
9092
FBSDKCoreKit: 0d1ae58388a458b8222f72025804cdc84eb5d0c3
9193
FBSDKLoginKit: aea68df6121c5e165ccae2fabfdc83c4644ee40f
92-
Firebase: 73c3e3b216ec1ecbc54d2ffdd4670c65c749edb1
93-
FirebaseAuth: b8cd992fca5b53dc6eec09e873a3f375f000c5a1
94-
FirebaseAuthUI: b3511544eeec97b719aeda7ccd779f7f0ff086d3
95-
FirebaseCore: 3f09591d51292843e2a46f18358d60bf4e996255
96-
FirebaseCoreDiagnostics: a31d987ba0fe16d59886a5dbadc2f1de871f88c8
97-
GoogleDataTransport: 11e3a5f2c190327df1a4a5d7e7ae3d4d5b9c9e4c
94+
Firebase: 456eeacc158d8c58586b7871619a81bb9f27d4ae
95+
FirebaseAuth: e6a214cc897d2eab7635b1e5dd6b4298fd1e776b
96+
FirebaseAuthUI: cf4fd21f00fe02a5a11e546eaba43e692563c5f8
97+
FirebaseCore: c959e8a598f83125c01c1700d9161b236ab3833c
98+
FirebaseCoreDiagnostics: 68ad972f99206cef818230f3f3179d52ccfb7f8c
99+
GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7
98100
GoogleUtilities: f8a43108b38a68eebe8b3540e1f4f2d28843ce20
99101
GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52
100102
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96

‎FirebaseGoogleAuthUI/FirebaseGoogleAuthUI.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 51;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -780,6 +780,7 @@
780780
"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
781781
"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMAppAuth\"",
782782
"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
783+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/FirebaseAuthUI\"",
783784
);
784785
OTHER_LDFLAGS = (
785786
"$(inherited)",
@@ -834,6 +835,7 @@
834835
"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
835836
"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMAppAuth\"",
836837
"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
838+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/FirebaseAuthUI\"",
837839
);
838840
OTHER_LDFLAGS = (
839841
"$(inherited)",

0 commit comments

Comments
 (0)