From dc99730d7d059d0142318ca59c8404d8f007f943 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Wed, 17 Jul 2024 09:54:50 -0700 Subject: [PATCH] Fix AuthUI build with Firebase 11 --- FirebaseAnonymousAuthUI.podspec | 2 +- FirebaseAuthUI.podspec | 2 +- .../Sources/FUIAccountSettingsOperationDeleteAccount.m | 2 ++ .../Sources/FUIAccountSettingsOperationForgotPassword.m | 2 ++ .../Sources/FUIAccountSettingsOperationUnlinkAccount.m | 2 ++ .../Sources/FUIAccountSettingsOperationUpdateEmail.m | 2 ++ .../Sources/FUIAccountSettingsOperationUpdateName.m | 2 ++ .../Sources/FUIAccountSettingsOperationUpdatePassword.m | 2 ++ FirebaseAuthUI/Sources/FUIAccountSettingsOperation_Internal.h | 2 +- FirebaseAuthUI/Sources/FUIAccountSettingsViewController.m | 2 +- FirebaseAuthUI/Sources/FUIAuth.m | 4 ++-- FirebaseDatabaseUI.podspec | 2 +- FirebaseEmailAuthUI.podspec | 2 +- FirebaseFacebookAuthUI.podspec | 2 +- FirebaseFirestoreUI.podspec | 2 +- FirebaseGoogleAuthUI.podspec | 2 +- FirebaseOAuthUI.podspec | 2 +- FirebasePhoneAuthUI.podspec | 2 +- FirebaseStorageUI.podspec | 2 +- FirebaseUI.podspec | 2 +- 20 files changed, 27 insertions(+), 15 deletions(-) diff --git a/FirebaseAnonymousAuthUI.podspec b/FirebaseAnonymousAuthUI.podspec index f2791b299c8..c806366c96b 100644 --- a/FirebaseAnonymousAuthUI.podspec +++ b/FirebaseAnonymousAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseAnonymousAuthUI' - s.version = '14.0.0' + s.version = '14.1.0' s.summary = 'Provides anonymous auth support for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseAuthUI.podspec b/FirebaseAuthUI.podspec index 3b7ceacfdb4..a4b4b8c4b5f 100644 --- a/FirebaseAuthUI.podspec +++ b/FirebaseAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseAuthUI' - s.version = '14.0.0' + s.version = '14.1.0' 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' } diff --git a/FirebaseAuthUI/Sources/FUIAccountSettingsOperationDeleteAccount.m b/FirebaseAuthUI/Sources/FUIAccountSettingsOperationDeleteAccount.m index 76c1180f6a6..ab30c3fdf54 100644 --- a/FirebaseAuthUI/Sources/FUIAccountSettingsOperationDeleteAccount.m +++ b/FirebaseAuthUI/Sources/FUIAccountSettingsOperationDeleteAccount.m @@ -19,6 +19,8 @@ #import "FirebaseAuthUI/Sources/FUIAccountSettingsOperation_Internal.h" #import "FirebaseAuthUI/Sources/FUIAccountSettingsOperationForgotPassword.h" +@import FirebaseAuth; + NS_ASSUME_NONNULL_BEGIN @implementation FUIAccountSettingsOperationDeleteAccount diff --git a/FirebaseAuthUI/Sources/FUIAccountSettingsOperationForgotPassword.m b/FirebaseAuthUI/Sources/FUIAccountSettingsOperationForgotPassword.m index 5e2b598df14..889bf8c49d8 100644 --- a/FirebaseAuthUI/Sources/FUIAccountSettingsOperationForgotPassword.m +++ b/FirebaseAuthUI/Sources/FUIAccountSettingsOperationForgotPassword.m @@ -19,6 +19,8 @@ #import "FirebaseAuthUI/Sources/FUIAccountSettingsOperation_Internal.h" #import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthBaseViewController_Internal.h" +@import FirebaseAuth; + NS_ASSUME_NONNULL_BEGIN @implementation FUIAccountSettingsOperationForgotPassword diff --git a/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUnlinkAccount.m b/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUnlinkAccount.m index a0484b56a09..a97995646b5 100644 --- a/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUnlinkAccount.m +++ b/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUnlinkAccount.m @@ -19,6 +19,8 @@ #import "FirebaseAuthUI/Sources/FUIAccountSettingsOperation_Internal.h" #import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthBaseViewController_Internal.h" +@import FirebaseAuth; + NS_ASSUME_NONNULL_BEGIN @interface FUIAccountSettingsOperationUnlinkAccount () diff --git a/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUpdateEmail.m b/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUpdateEmail.m index 324ae3222b6..4bf7e94b3e2 100644 --- a/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUpdateEmail.m +++ b/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUpdateEmail.m @@ -19,6 +19,8 @@ #import "FirebaseAuthUI/Sources/FUIAccountSettingsOperation_Internal.h" #import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthBaseViewController_Internal.h" +@import FirebaseAuth; + NS_ASSUME_NONNULL_BEGIN @implementation FUIAccountSettingsOperationUpdateEmail diff --git a/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUpdateName.m b/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUpdateName.m index d1836ac7676..0f0e34f0ec8 100644 --- a/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUpdateName.m +++ b/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUpdateName.m @@ -18,6 +18,8 @@ #import "FirebaseAuthUI/Sources/FUIAccountSettingsOperation_Internal.h" +@import FirebaseAuth; + NS_ASSUME_NONNULL_BEGIN @implementation FUIAccountSettingsOperationUpdateName diff --git a/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUpdatePassword.m b/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUpdatePassword.m index b7e44a98585..120491524df 100644 --- a/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUpdatePassword.m +++ b/FirebaseAuthUI/Sources/FUIAccountSettingsOperationUpdatePassword.m @@ -18,6 +18,8 @@ #import "FirebaseAuthUI/Sources/FUIAccountSettingsOperation_Internal.h" +@import FirebaseAuth; + NS_ASSUME_NONNULL_BEGIN @interface FUIAccountSettingsOperationUpdatePassword () diff --git a/FirebaseAuthUI/Sources/FUIAccountSettingsOperation_Internal.h b/FirebaseAuthUI/Sources/FUIAccountSettingsOperation_Internal.h index 94e8901fdac..33a989d6c09 100644 --- a/FirebaseAuthUI/Sources/FUIAccountSettingsOperation_Internal.h +++ b/FirebaseAuthUI/Sources/FUIAccountSettingsOperation_Internal.h @@ -16,7 +16,7 @@ #import "FirebaseAuthUI/Sources/FUIAccountSettingsOperation.h" -#import +@import FirebaseAuth; #import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAccountSettingsOperationType.h" #import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthStrings.h" diff --git a/FirebaseAuthUI/Sources/FUIAccountSettingsViewController.m b/FirebaseAuthUI/Sources/FUIAccountSettingsViewController.m index eff14abf90d..069d13abc91 100644 --- a/FirebaseAuthUI/Sources/FUIAccountSettingsViewController.m +++ b/FirebaseAuthUI/Sources/FUIAccountSettingsViewController.m @@ -16,7 +16,7 @@ #import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAccountSettingsViewController.h" -#import +@import FirebaseAuth; #import "FirebaseAuthUI/Sources/FUIAccountSettingsOperation.h" #import "FirebaseAuthUI/Sources/FUIAccountSettingsOperationDeleteAccount.h" diff --git a/FirebaseAuthUI/Sources/FUIAuth.m b/FirebaseAuthUI/Sources/FUIAuth.m index 0d43914ed76..8ef6c8f0d67 100644 --- a/FirebaseAuthUI/Sources/FUIAuth.m +++ b/FirebaseAuthUI/Sources/FUIAuth.m @@ -20,14 +20,14 @@ #import #import -#import -#import #import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthBaseViewController_Internal.h" #import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthErrors.h" #import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthErrorUtils.h" #import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthPickerViewController.h" #import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthStrings.h" +@import FirebaseAuth; + /** @var kAppNameCodingKey @brief The key used to encode the app Name for NSCoding. */ diff --git a/FirebaseDatabaseUI.podspec b/FirebaseDatabaseUI.podspec index 3c29bff69f1..8647bf3471b 100644 --- a/FirebaseDatabaseUI.podspec +++ b/FirebaseDatabaseUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseDatabaseUI' - s.version = '14.0.0' + s.version = '14.1.0' s.summary = 'Prebuilt data sources and UI bindings for Firebase Database.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseEmailAuthUI.podspec b/FirebaseEmailAuthUI.podspec index 5638888fbc1..5173b2506ec 100644 --- a/FirebaseEmailAuthUI.podspec +++ b/FirebaseEmailAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseEmailAuthUI' - s.version = '14.0.0' + s.version = '14.1.0' s.summary = 'An email authentication provider for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseFacebookAuthUI.podspec b/FirebaseFacebookAuthUI.podspec index 1ebc1a63412..3548874e6ca 100644 --- a/FirebaseFacebookAuthUI.podspec +++ b/FirebaseFacebookAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseFacebookAuthUI' - s.version = '14.0.0' + s.version = '14.1.0' s.summary = 'A Facebook auth provider for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseFirestoreUI.podspec b/FirebaseFirestoreUI.podspec index 468d35509cb..659de4bc667 100644 --- a/FirebaseFirestoreUI.podspec +++ b/FirebaseFirestoreUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseFirestoreUI' - s.version = '14.0.0' + s.version = '14.1.0' s.summary = 'Data libraries and UI bindings for Firestore.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseGoogleAuthUI.podspec b/FirebaseGoogleAuthUI.podspec index ede7eaa9879..2681d4ce27c 100644 --- a/FirebaseGoogleAuthUI.podspec +++ b/FirebaseGoogleAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseGoogleAuthUI' - s.version = '14.0.0' + s.version = '14.1.0' s.summary = 'Google authentication for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseOAuthUI.podspec b/FirebaseOAuthUI.podspec index 4d5206165bb..b1c701d004b 100644 --- a/FirebaseOAuthUI.podspec +++ b/FirebaseOAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseOAuthUI' - s.version = '14.0.0' + s.version = '14.1.0' s.summary = 'A collection of OAuth providers for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebasePhoneAuthUI.podspec b/FirebasePhoneAuthUI.podspec index 67272044622..4ea40ad0b39 100644 --- a/FirebasePhoneAuthUI.podspec +++ b/FirebasePhoneAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebasePhoneAuthUI' - s.version = '14.0.0' + s.version = '14.1.0' s.summary = 'A phone auth provider for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseStorageUI.podspec b/FirebaseStorageUI.podspec index 34094cecefe..379466d5f33 100644 --- a/FirebaseStorageUI.podspec +++ b/FirebaseStorageUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseStorageUI' - s.version = '14.0.0' + s.version = '14.1.0' s.summary = 'UI binding libraries for Firebase.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseUI.podspec b/FirebaseUI.podspec index 751d62c8422..7294b066688 100644 --- a/FirebaseUI.podspec +++ b/FirebaseUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseUI' - s.version = '14.0.0' + s.version = '14.1.0' s.summary = 'UI binding libraries for Firebase.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' }