diff --git a/FirebaseAnonymousAuthUI.podspec b/FirebaseAnonymousAuthUI.podspec index d0c2c6cc206..b2aaf3c8c63 100644 --- a/FirebaseAnonymousAuthUI.podspec +++ b/FirebaseAnonymousAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseAnonymousAuthUI' - s.version = '12.1.1' + s.version = '12.2.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' } @@ -19,7 +19,7 @@ Pod::Spec.new do |s| s.public_header_files = 'FirebaseAnonymousAuthUI/Sources/Public/FirebaseAnonymousAuthUI/*.h' s.source_files = 'FirebaseAnonymousAuthUI/Sources/**/*.{h,m}' s.dependency 'FirebaseAuthUI' - s.dependency 'FirebaseAuth', '~> 8.0' + s.dependency 'FirebaseAuth', '>= 8.0', '< 10.0' s.dependency 'FirebaseCore' s.resource_bundles = { 'FirebaseAnonymousAuthUI' => [ diff --git a/FirebaseAuthUI.podspec b/FirebaseAuthUI.podspec index a27919bf5ec..b88ed23b065 100644 --- a/FirebaseAuthUI.podspec +++ b/FirebaseAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseAuthUI' - s.version = '12.1.1' + s.version = '12.2.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' } @@ -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' + s.dependency 'FirebaseAuth', '>= 8.0', '< 10.0' s.dependency 'FirebaseCore' s.resource_bundles = { 'FirebaseAuthUI' => ['FirebaseAuthUI/Sources/{Resources,Strings}/*.{xib,png,lproj}'] diff --git a/FirebaseDatabaseUI.podspec b/FirebaseDatabaseUI.podspec index 8cef64db6ae..9598fbbbc27 100644 --- a/FirebaseDatabaseUI.podspec +++ b/FirebaseDatabaseUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseDatabaseUI' - s.version = '12.1.1' + s.version = '12.2.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' } @@ -18,6 +18,6 @@ Pod::Spec.new do |s| s.public_header_files = 'FirebaseDatabaseUI/Sources/Public/FirebaseDatabaseUI/*.h' s.source_files = 'FirebaseDatabaseUI/Sources/**/*.{h,m}' - s.dependency 'FirebaseDatabase', '~> 8.0' + s.dependency 'FirebaseDatabase', '>= 8.0', '< 10.0' end diff --git a/FirebaseEmailAuthUI.podspec b/FirebaseEmailAuthUI.podspec index 478ca253261..e9f2f7540a6 100644 --- a/FirebaseEmailAuthUI.podspec +++ b/FirebaseEmailAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseEmailAuthUI' - s.version = '12.1.1' + s.version = '12.2.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 7115d409529..ab25b381acc 100644 --- a/FirebaseFacebookAuthUI.podspec +++ b/FirebaseFacebookAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseFacebookAuthUI' - s.version = '12.1.1' + s.version = '12.2.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 03f056fb897..0bd20499bbc 100644 --- a/FirebaseFirestoreUI.podspec +++ b/FirebaseFirestoreUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseFirestoreUI' - s.version = '12.1.1' + s.version = '12.2.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' } @@ -18,6 +18,6 @@ Pod::Spec.new do |s| s.public_header_files = 'FirebaseFirestoreUI/Sources/Public/FirebaseFirestoreUI/*.h' s.source_files = 'FirebaseFirestoreUI/Sources/**/*.{h,m}' - s.dependency 'FirebaseFirestore', '~> 8.0' + s.dependency 'FirebaseFirestore', '>= 8.0', '< 10.0' end diff --git a/FirebaseGoogleAuthUI.podspec b/FirebaseGoogleAuthUI.podspec index 27ac2eb97be..b154340437d 100644 --- a/FirebaseGoogleAuthUI.podspec +++ b/FirebaseGoogleAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseGoogleAuthUI' - s.version = '12.1.1' + s.version = '12.2.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 06f68c1b0e2..f5701a74601 100644 --- a/FirebaseOAuthUI.podspec +++ b/FirebaseOAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseOAuthUI' - s.version = '12.1.1' + s.version = '12.2.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' } @@ -19,7 +19,7 @@ Pod::Spec.new do |s| s.public_header_files = 'FirebaseOAuthUI/Sources/Public/FirebaseOAuthUI/*.h' s.source_files = 'FirebaseOAuthUI/Sources/**/*.{h,m}' s.dependency 'FirebaseAuthUI', '>= 12.0.2', '< 13.0' - s.dependency 'FirebaseAuth', '~> 8.0' + s.dependency 'FirebaseAuth', '>= 8.0', '< 10.0' s.resource_bundles = { 'FirebaseOAuthUI' => ['FirebaseOAuthUI/Sources/{Resources,Strings}/*.{png,lproj}'] } diff --git a/FirebasePhoneAuthUI.podspec b/FirebasePhoneAuthUI.podspec index f2a9379c04f..d4d43944621 100644 --- a/FirebasePhoneAuthUI.podspec +++ b/FirebasePhoneAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebasePhoneAuthUI' - s.version = '12.1.1' + s.version = '12.2.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 4b704f05522..2695a190d4c 100644 --- a/FirebaseStorageUI.podspec +++ b/FirebaseStorageUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseStorageUI' - s.version = '12.1.1' + s.version = '12.2.0' s.summary = 'UI binding libraries for Firebase.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.tvos.deployment_target = '11.0' s.public_header_files = 'FirebaseStorageUI/Sources/Public/FirebaseStorageUI/*.h' s.source_files = 'FirebaseStorageUI/Sources/**/*.{h,m}' - s.dependency 'FirebaseStorage', '~> 8.0' + s.dependency 'FirebaseStorage', '>= 8.0', '< 10.0' s.dependency 'SDWebImage', '~> 5.6' end diff --git a/FirebaseStorageUI/Sources/FUIStorageImageLoader.m b/FirebaseStorageUI/Sources/FUIStorageImageLoader.m index 177dca6f0a7..816467378b3 100644 --- a/FirebaseStorageUI/Sources/FUIStorageImageLoader.m +++ b/FirebaseStorageUI/Sources/FUIStorageImageLoader.m @@ -18,7 +18,13 @@ #import "FirebaseStorageUI/Sources/Public/FirebaseStorageUI/FIRStorageDownloadTask+SDWebImage.h" #import -#import +#if __has_include() + // Firebase 8.x + #import +#else + // Firebase 9.0+ + #import +#endif #if SWIFT_PACKAGE @import GTMSessionFetcherCore; @@ -120,7 +126,7 @@ - (BOOL)canRequestImageForURL:(NSURL *)url { [download observeStatus:FIRStorageTaskStatusProgress handler:^(FIRStorageTaskSnapshot * _Nonnull snapshot) { // Check progressive decoding if need if (options & SDWebImageProgressiveLoad) { - FIRStorageDownloadTask *task = snapshot.task; + FIRStorageDownloadTask *task = (FIRStorageDownloadTask *)snapshot.task; // Currently, FIRStorageDownloadTask does not have the API to grab partial data // But since FirebaseUI and Firebase are seamless component, we access the internal fetcher here GTMSessionFetcher *fetcher = task.fetcher; @@ -160,7 +166,7 @@ - (BOOL)canRequestImageForURL:(NSURL *)url { } - (BOOL)shouldBlockFailedURLWithURL:(NSURL *)url error:(NSError *)error { - if ([error.domain isEqualToString:FIRStorageErrorDomain]) { + if ([error.domain isEqualToString:@"FIRStorageErrorDomain"]) { if (error.code == FIRStorageErrorCodeBucketNotFound || error.code == FIRStorageErrorCodeProjectNotFound || error.code == FIRStorageErrorCodeObjectNotFound) { diff --git a/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/FIRStorageDownloadTask+SDWebImage.h b/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/FIRStorageDownloadTask+SDWebImage.h index 17814dc344a..c6610cde619 100644 --- a/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/FIRStorageDownloadTask+SDWebImage.h +++ b/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/FIRStorageDownloadTask+SDWebImage.h @@ -14,7 +14,13 @@ // limitations under the License. // -#import +#if __has_include() + // Firebase 8.x + #import +#else + // Firebase 9.0+ + #import +#endif #import NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/FUIStorageDefine.h b/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/FUIStorageDefine.h index 7da1dcb47b5..742aab9d0cb 100644 --- a/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/FUIStorageDefine.h +++ b/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/FUIStorageDefine.h @@ -14,7 +14,13 @@ // limitations under the License. // -#import +#if __has_include() + // Firebase 8.x + #import +#else + // Firebase 9.0+ + #import +#endif #import /** diff --git a/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/NSURL+FirebaseStorage.h b/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/NSURL+FirebaseStorage.h index 93b4db49d6c..4677908d89c 100644 --- a/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/NSURL+FirebaseStorage.h +++ b/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/NSURL+FirebaseStorage.h @@ -14,7 +14,14 @@ // limitations under the License. // #import -#import + +#if __has_include() + // Firebase 8.x + #import +#else + // Firebase 9.0+ + #import +#endif NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/UIImageView+FirebaseStorage.h b/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/UIImageView+FirebaseStorage.h index 1e816d62a5f..021b74562f0 100644 --- a/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/UIImageView+FirebaseStorage.h +++ b/FirebaseStorageUI/Sources/Public/FirebaseStorageUI/UIImageView+FirebaseStorage.h @@ -16,7 +16,13 @@ #import -#import +#if __has_include() + // Firebase 8.x + #import +#else + // Firebase 9.0+ + #import +#endif #import NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseUI.podspec b/FirebaseUI.podspec index e13e69c93c1..a350fed442e 100644 --- a/FirebaseUI.podspec +++ b/FirebaseUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseUI' - s.version = '12.1.1' + s.version = '12.2.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/Package.swift b/Package.swift index 7b5f11db0b4..c56a5ba0884 100644 --- a/Package.swift +++ b/Package.swift @@ -72,7 +72,7 @@ let package = Package( .package( name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", - from: "8.0.0" + "8.0.0"..<"10.0.0" ), .package( name: "GoogleSignIn", diff --git a/samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.m b/samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.m index 4b45cb8f811..4532cdd22f5 100644 --- a/samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.m +++ b/samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.m @@ -16,8 +16,9 @@ #import "FUIAppDelegate.h" -@import Firebase; +@import FirebaseCore; @import FirebaseAuthUI; +@import FirebaseDynamicLinks; @import FBSDKCoreKit; #import