Skip to content

Commit be95f19

Browse files
paulb777paulb777
authored
Fix Xcode 16 build error (#1211)
1 parent f9fd262 commit be95f19

25 files changed

Lines changed: 41 additions & 1741 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ DerivedData
2626

2727
.DS_Store
2828
Pods/
29+
Podfile.lock
2930
*.xcworkspace/
3031
samples/**/GoogleService-Info.plist

‎FirebaseAnonymousAuthUI/FirebaseAnonymousAuthUI.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
@@ -467,7 +467,7 @@
467467
"@loader_path/Frameworks",
468468
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"",
469469
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"",
470-
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\"",
470+
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuthInterop\"",
471471
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"",
472472
"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"",
473473
"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"",
@@ -479,6 +479,7 @@
479479
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal\"",
480480
"\"${PODS_CONFIGURATION_BUILD_DIR}/RecaptchaInterop\"",
481481
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAppCheckInterop\"",
482+
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension\"",
482483
);
483484
OTHER_LDFLAGS = (
484485
"$(inherited)",
@@ -507,7 +508,7 @@
507508
"@loader_path/Frameworks",
508509
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"",
509510
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"",
510-
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\"",
511+
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuthInterop\"",
511512
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"",
512513
"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"",
513514
"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"",
@@ -517,6 +518,7 @@
517518
"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
518519
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuthUI\"",
519520
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal\"",
521+
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension\"",
520522
"\"${PODS_CONFIGURATION_BUILD_DIR}/RecaptchaInterop\"",
521523
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAppCheckInterop\"",
522524
);

‎FirebaseAnonymousAuthUI/Podfile.lock‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎FirebaseAuthUI.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'FirebaseAuthUI'
3-
s.version = '14.2.4'
3+
s.version = '14.2.5'
44
s.summary = 'A prebuilt authentication UI flow for Firebase Auth.'
55
s.homepage = 'https://github.com/firebase/FirebaseUI-iOS'
66
s.license = { :type => 'Apache 2.0', :file => 'LICENSE' }
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
1818

1919
s.public_header_files = 'FirebaseAuthUI/Sources/Public/FirebaseAuthUI/*.h'
2020
s.source_files = 'FirebaseAuthUI/Sources/**/*.{h,m}'
21-
s.dependency 'FirebaseAuth', '>= 8.0', '< 12.0'
21+
s.dependency 'FirebaseAuth', '>= 11.0', '< 12.0'
2222
s.dependency 'FirebaseCore'
2323
s.resource_bundles = {
2424
'FirebaseAuthUI' => ['FirebaseAuthUI/Sources/{Resources,Strings}/*.{xib,png,lproj}']

‎FirebaseAuthUI/FirebaseAuthUI.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,7 @@
838838
LD_RUNPATH_SEARCH_PATHS = (
839839
"$(inherited)",
840840
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal\"",
841+
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension\"",
841842
);
842843
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
843844
MTL_FAST_MATH = YES;
@@ -901,6 +902,7 @@
901902
LD_RUNPATH_SEARCH_PATHS = (
902903
"$(inherited)",
903904
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal\"",
905+
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension\"",
904906
);
905907
MTL_ENABLE_DEBUG_INFO = NO;
906908
MTL_FAST_MATH = YES;
@@ -968,7 +970,7 @@
968970
"@loader_path/Frameworks",
969971
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth",
970972
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore",
971-
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics",
973+
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuthInterop",
972974
"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher",
973975
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport",
974976
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities",
@@ -994,7 +996,7 @@
994996
"@loader_path/Frameworks",
995997
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth",
996998
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore",
997-
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics",
999+
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuthInterop",
9981000
"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher",
9991001
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport",
10001002
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities",

‎FirebaseAuthUI/FirebaseAuthUITests/FUIAuthTest.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ - (void)setUp {
105105
if ([FIRApp defaultApp] == nil) {
106106
FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:@"1:1069647793992:ios:91eecf4730fc920b"
107107
GCMSenderID:@"1069647793992"];
108+
options.APIKey = @"fakeAPIKey";
108109
[FIRApp configureWithOptions:options];
109110
}
110111

‎FirebaseAuthUI/Podfile.lock‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎FirebaseAuthUI/Sources/FUIAuth.m‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -352,17 +352,6 @@ - (void)invokeResultCallbackWithAuthDataResult:(nullable FIRAuthDataResult *)aut
352352
URL:(nullable NSURL *)url
353353
error:(nullable NSError *)error {
354354
dispatch_async(dispatch_get_main_queue(), ^{
355-
// Firebase 10 signatures.
356-
if ([self.delegate respondsToSelector:@selector(authUI:didSignInWithAuthDataResult:URL:error:)]) {
357-
[self.delegate authUI:self
358-
didSignInWithAuthDataResult:authDataResult
359-
URL:url
360-
error:error];
361-
}
362-
if ([self.delegate respondsToSelector:@selector(authUI:didSignInWithAuthDataResult:error:)]) {
363-
[self.delegate authUI:self didSignInWithAuthDataResult:authDataResult error:error];
364-
}
365-
// Firebase 11+ signatures.
366355
if ([self.delegate respondsToSelector:@selector(authUI:didSignInWith:URL:error:)]) {
367356
[self.delegate authUI:self didSignInWith:authDataResult URL:url error:error];
368357
}

‎FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuth.h‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,6 @@ typedef void (^FUIAuthResultCallback)(FIRUser *_Nullable user, NSError *_Nullabl
4646

4747
@optional
4848

49-
/** @fn authUI:didSignInWithAuthDataResult:error:
50-
@brief Message sent after the sign in process has completed to report the signed in user or
51-
error encountered. Use this variation with Firebase 10 and earlier.
52-
@param authUI The @c FUIAuth instance sending the message.
53-
@param authDataResult The data result if the sign in attempt was successful.
54-
@param url pass the deep link associated with an email link sign-in completion. It is useful
55-
for the developer to access the state before the sign-in attempt was triggered.
56-
@param error The error that occurred during sign in, if any.
57-
*/
58-
- (void)authUI:(FUIAuth *)authUI
59-
didSignInWithAuthDataResult:(nullable FIRAuthDataResult *)authDataResult
60-
URL:(nullable NSURL *)url
61-
error:(nullable NSError *)error;
62-
6349
/** @fn authUI:didSignInWithAuthDataResult:error:
6450
@brief Message sent after the sign in process has completed to report the signed in user or
6551
error encountered. Use this variation with Firebase 11 and later. Swift implementations
@@ -75,17 +61,6 @@ typedef void (^FUIAuthResultCallback)(FIRUser *_Nullable user, NSError *_Nullabl
7561
URL:(nullable NSURL *)url
7662
error:(nullable NSError *)error;
7763

78-
/** @fn authUI:didSignInWithAuthDataResult:error:
79-
@brief Message sent after the sign in process has completed to report the signed in user or
80-
error encountered. Use this variation with Firebase 10 and earlier.
81-
@param authUI The @c FUIAuth instance sending the message.
82-
@param authDataResult The data result if the sign in attempt was successful.
83-
@param error The error that occurred during sign in, if any.
84-
*/
85-
- (void)authUI:(FUIAuth *)authUI
86-
didSignInWithAuthDataResult:(nullable FIRAuthDataResult *)authDataResult
87-
error:(nullable NSError *)error;
88-
8964
/** @fn authUI:didSignInWithAuthDataResult:error:
9065
@brief Message sent after the sign in process has completed to report the signed in user or
9166
error encountered. Use this variation with Firebase 11 and later. Swift implementations

‎FirebaseDatabaseUI/FirebaseDatabaseUI.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,14 +513,15 @@
513513
"@executable_path/Frameworks",
514514
"@loader_path/Frameworks",
515515
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"",
516-
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\"",
516+
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuthInterop\"",
517517
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseDatabase\"",
518518
"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"",
519519
"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"",
520520
"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
521521
"\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"",
522522
"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
523523
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal\"",
524+
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension\"",
524525
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseSharedSwift\"",
525526
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAppCheckInterop\"",
526527
);
@@ -540,14 +541,15 @@
540541
"@executable_path/Frameworks",
541542
"@loader_path/Frameworks",
542543
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"",
543-
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\"",
544+
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuthInterop\"",
544545
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseDatabase\"",
545546
"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"",
546547
"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"",
547548
"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
548549
"\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"",
549550
"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
550551
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal\"",
552+
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension\"",
551553
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseSharedSwift\"",
552554
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAppCheckInterop\"",
553555
);

0 commit comments

Comments
 (0)