Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Xcode 16 build error #1211

Merged
merged 7 commits into from
Oct 15, 2024
Merged

Fix Xcode 16 build error #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7914ec7
Fix Xcode 16 build error
paulb777 Oct 15, 2024
f34a9cd
Require FirebaseAuth 11
paulb777 Oct 15, 2024
ab46e58
Remove Podfile.locks
paulb777 Oct 15, 2024
f02e468
update .gitignore
paulb777 Oct 15, 2024
abfab3f
Update rpaths to fix tests build
paulb777 Oct 15, 2024
3ea2118
one more path
paulb777 Oct 15, 2024
cbcdee5
Add fake to fix unit tests
paulb777 Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@ DerivedData

.DS_Store
Pods/
Podfile.lock
*.xcworkspace/
samples/**/GoogleService-Info.plist
8 changes: 5 additions & 3 deletions FirebaseAnonymousAuthUI/FirebaseAnonymousAuthUI.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -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\"",
Expand All @@ -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)",
Expand Down Expand Up @@ -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\"",
Expand All @@ -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\"",
);
Expand Down
73 changes: 0 additions & 73 deletions FirebaseAnonymousAuthUI/Podfile.lock
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions FirebaseAuthUI.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FirebaseAuthUI'
s.version = '14.2.4'
paulb777 marked this conversation as resolved.
Show resolved Hide resolved
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' }
Expand All @@ -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}']
Expand Down
6 changes: 4 additions & 2 deletions FirebaseAuthUI/FirebaseAuthUI.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
1 change: 1 addition & 0 deletions FirebaseAuthUI/FirebaseAuthUITests/FUIAuthTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}

Expand Down
72 changes: 0 additions & 72 deletions FirebaseAuthUI/Podfile.lock
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions FirebaseAuthUI/Sources/FUIAuth.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
Expand Down
25 changes: 0 additions & 25 deletions FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuth.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions FirebaseDatabaseUI/FirebaseDatabaseUI.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\"",
);
Expand All @@ -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\"",
);
Expand Down
Loading