Fix Xcode 16 build error (#1211)

firebase · Oct 15, 2024 · be95f19 · be95f19
1 parent f9fd262
commit be95f19
Show file tree

Hide file tree

Showing 25 changed files with 41 additions and 1,741 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,5 +26,6 @@ DerivedData
 
 .DS_Store
 Pods/
+Podfile.lock
 *.xcworkspace/
 samples/**/GoogleService-Info.plist
diff --git a/FirebaseAnonymousAuthUI/FirebaseAnonymousAuthUI.xcodeproj/project.pbxproj b/FirebaseAnonymousAuthUI/FirebaseAnonymousAuthUI.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -467,7 +467,7 @@
 					"@loader_path/Frameworks",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuthInterop\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"",
@@ -479,6 +479,7 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/RecaptchaInterop\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAppCheckInterop\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension\"",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -507,7 +508,7 @@
 					"@loader_path/Frameworks",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuthInterop\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"",
@@ -517,6 +518,7 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuthUI\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/RecaptchaInterop\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAppCheckInterop\"",
 				);

diff --git a/FirebaseAnonymousAuthUI/Podfile.lock b/FirebaseAnonymousAuthUI/Podfile.lock
diff --git a/FirebaseAuthUI.podspec b/FirebaseAuthUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseAuthUI'
-  s.version      = '14.2.4'
+  s.version      = '14.2.5'
   s.summary      = 'A prebuilt authentication UI flow for Firebase Auth.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
 
   s.public_header_files = 'FirebaseAuthUI/Sources/Public/FirebaseAuthUI/*.h'
   s.source_files = 'FirebaseAuthUI/Sources/**/*.{h,m}'
-  s.dependency 'FirebaseAuth', '>= 8.0', '< 12.0'
+  s.dependency 'FirebaseAuth', '>= 11.0', '< 12.0'
   s.dependency 'FirebaseCore'
   s.resource_bundles = {
     'FirebaseAuthUI' => ['FirebaseAuthUI/Sources/{Resources,Strings}/*.{xib,png,lproj}']

diff --git a/FirebaseAuthUI/FirebaseAuthUI.xcodeproj/project.pbxproj b/FirebaseAuthUI/FirebaseAuthUI.xcodeproj/project.pbxproj
@@ -838,6 +838,7 @@
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -901,6 +902,7 @@
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
@@ -968,7 +970,7 @@
 					"@loader_path/Frameworks",
 					"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth",
 					"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore",
-					"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics",
+					"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuthInterop",
 					"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher",
 					"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport",
 					"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities",
@@ -994,7 +996,7 @@
 					"@loader_path/Frameworks",
 					"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth",
 					"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore",
-					"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics",
+					"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuthInterop",
 					"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher",
 					"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport",
 					"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities",

diff --git a/FirebaseAuthUI/FirebaseAuthUITests/FUIAuthTest.m b/FirebaseAuthUI/FirebaseAuthUITests/FUIAuthTest.m
@@ -105,6 +105,7 @@ - (void)setUp {
   if ([FIRApp defaultApp] == nil) {
     FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:@"1:1069647793992:ios:91eecf4730fc920b"
                                                       GCMSenderID:@"1069647793992"];
+    options.APIKey = @"fakeAPIKey";
     [FIRApp configureWithOptions:options];
   }
 

diff --git a/FirebaseAuthUI/Podfile.lock b/FirebaseAuthUI/Podfile.lock
diff --git a/FirebaseAuthUI/Sources/FUIAuth.m b/FirebaseAuthUI/Sources/FUIAuth.m
@@ -352,17 +352,6 @@ - (void)invokeResultCallbackWithAuthDataResult:(nullable FIRAuthDataResult *)aut
                                            URL:(nullable NSURL *)url
                                          error:(nullable NSError *)error {
   dispatch_async(dispatch_get_main_queue(), ^{
-    // Firebase 10 signatures.
-    if ([self.delegate respondsToSelector:@selector(authUI:didSignInWithAuthDataResult:URL:error:)]) {
-      [self.delegate authUI:self
-          didSignInWithAuthDataResult:authDataResult
-                                  URL:url
-                                error:error];
-    }
-    if ([self.delegate respondsToSelector:@selector(authUI:didSignInWithAuthDataResult:error:)]) {
-      [self.delegate authUI:self didSignInWithAuthDataResult:authDataResult error:error];
-    }
-    // Firebase 11+ signatures.
     if ([self.delegate respondsToSelector:@selector(authUI:didSignInWith:URL:error:)]) {
       [self.delegate authUI:self didSignInWith:authDataResult URL:url error:error];
     }

diff --git a/FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuth.h b/FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuth.h
@@ -46,20 +46,6 @@ typedef void (^FUIAuthResultCallback)(FIRUser *_Nullable user, NSError *_Nullabl
 
 @optional
 
-/** @fn authUI:didSignInWithAuthDataResult:error:
-    @brief Message sent after the sign in process has completed to report the signed in user or
-        error encountered. Use this variation with Firebase 10 and earlier.
-    @param authUI The @c FUIAuth instance sending the message.
-    @param authDataResult The data result if the sign in attempt was successful.
-    @param url pass the deep link associated with an email link sign-in completion. It is useful
-               for the developer to access the state before the sign-in attempt was triggered.
-    @param error The error that occurred during sign in, if any.
- */
-- (void)authUI:(FUIAuth *)authUI
-    didSignInWithAuthDataResult:(nullable FIRAuthDataResult *)authDataResult
-                            URL:(nullable NSURL *)url
-                          error:(nullable NSError *)error;
-
 /** @fn authUI:didSignInWithAuthDataResult:error:
     @brief Message sent after the sign in process has completed to report the signed in user or
         error encountered. Use this variation with Firebase 11 and later. Swift implementations
@@ -75,17 +61,6 @@ typedef void (^FUIAuthResultCallback)(FIRUser *_Nullable user, NSError *_Nullabl
               URL:(nullable NSURL *)url
             error:(nullable NSError *)error;
 
-/** @fn authUI:didSignInWithAuthDataResult:error:
-    @brief Message sent after the sign in process has completed to report the signed in user or
-        error encountered. Use this variation with Firebase 10 and earlier.
-    @param authUI The @c FUIAuth instance sending the message.
-    @param authDataResult The data result if the sign in attempt was successful.
-    @param error The error that occurred during sign in, if any.
- */
-- (void)authUI:(FUIAuth *)authUI
-    didSignInWithAuthDataResult:(nullable FIRAuthDataResult *)authDataResult
-                          error:(nullable NSError *)error;
-
 /** @fn authUI:didSignInWithAuthDataResult:error:
     @brief Message sent after the sign in process has completed to report the signed in user or
         error encountered. Use this variation with Firebase 11 and later. Swift implementations

diff --git a/FirebaseDatabaseUI/FirebaseDatabaseUI.xcodeproj/project.pbxproj b/FirebaseDatabaseUI/FirebaseDatabaseUI.xcodeproj/project.pbxproj
@@ -513,14 +513,15 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuthInterop\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseDatabase\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseSharedSwift\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAppCheckInterop\"",
 				);
@@ -540,14 +541,15 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuthInterop\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseDatabase\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseSharedSwift\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAppCheckInterop\"",
 				);