diff --git a/FirebaseAnonymousAuthUI.podspec b/FirebaseAnonymousAuthUI.podspec index 40c693f3eb..47cbc7d1d5 100644 --- a/FirebaseAnonymousAuthUI.podspec +++ b/FirebaseAnonymousAuthUI.podspec @@ -18,7 +18,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 'FirebaseAuthUI', '>= 14.2' s.dependency 'FirebaseAuth', '>= 8.0', '< 12.0' s.dependency 'FirebaseCore' s.resource_bundles = { diff --git a/FirebaseAuthUI/Sources/FUIAuthBaseViewController.m b/FirebaseAuthUI/Sources/FUIAuthBaseViewController.m index 38cf3a5a1b..a5de7c73e3 100644 --- a/FirebaseAuthUI/Sources/FUIAuthBaseViewController.m +++ b/FirebaseAuthUI/Sources/FUIAuthBaseViewController.m @@ -131,7 +131,7 @@ + (UIActivityIndicatorView *)addActivityIndicator:(UIView *)view { } UIActivityIndicatorView *activityIndicator = [[UIActivityIndicatorView alloc] - initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; + initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleLarge]; UIView *tintView = [[UIView alloc] initWithFrame:CGRectInset(activityIndicator.frame, -kActivityIndiactorPadding, -kActivityIndiactorPadding)]; diff --git a/FirebaseAuthUI/Sources/FUIAuthPickerViewController.m b/FirebaseAuthUI/Sources/FUIAuthPickerViewController.m index 2821b87391..51bee95e89 100644 --- a/FirebaseAuthUI/Sources/FUIAuthPickerViewController.m +++ b/FirebaseAuthUI/Sources/FUIAuthPickerViewController.m @@ -171,14 +171,7 @@ - (void)viewDidLayoutSubviews { + kButtonContainerBottomMargin + kTOSViewBottomMargin; CGFloat contentViewWidth = CGRectGetWidth(self.view.bounds); _scrollView.frame = self.view.frame; - CGFloat scrollViewHeight; - if (@available(iOS 11.0, *)) { - scrollViewHeight = CGRectGetHeight(_scrollView.frame) - _scrollView.safeAreaInsets.top; - } else { - scrollViewHeight = CGRectGetHeight(_scrollView.frame) - - CGRectGetHeight(self.navigationController.navigationBar.frame) - - CGRectGetHeight([UIApplication sharedApplication].statusBarFrame); - } + CGFloat scrollViewHeight = CGRectGetHeight(_scrollView.frame) - _scrollView.safeAreaInsets.top; CGFloat contentViewY = scrollViewHeight - contentViewHeight; if (contentViewY < 0) { contentViewY = 0; diff --git a/FirebaseEmailAuthUI.podspec b/FirebaseEmailAuthUI.podspec index 2cc5d9399c..8d210349e3 100644 --- a/FirebaseEmailAuthUI.podspec +++ b/FirebaseEmailAuthUI.podspec @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.source_files = 'FirebaseEmailAuthUI/Sources/**/*.{h,m}' s.dependency 'FirebaseAuth' s.dependency 'FirebaseCore' - s.dependency 'FirebaseAuthUI' + s.dependency 'FirebaseAuthUI', '>= 14.2' s.dependency 'GoogleUtilities/UserDefaults' s.resource_bundles = { 'FirebaseEmailAuthUI' => ['FirebaseEmailAuthUI/Sources/Resources/*.{xib,png}'] diff --git a/FirebaseFacebookAuthUI.podspec b/FirebaseFacebookAuthUI.podspec index cdc1af52a7..01000c7602 100644 --- a/FirebaseFacebookAuthUI.podspec +++ b/FirebaseFacebookAuthUI.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.source_files = 'FirebaseFacebookAuthUI/Sources/**/*.{h,m}' s.dependency 'FirebaseAuth' s.dependency 'FirebaseCore' - s.dependency 'FirebaseAuthUI' + s.dependency 'FirebaseAuthUI', '>= 14.2' s.dependency 'FBSDKLoginKit', '>= 11.0', '< 17.0' s.dependency 'FBSDKCoreKit_Basics' s.resource_bundles = { diff --git a/FirebaseGoogleAuthUI.podspec b/FirebaseGoogleAuthUI.podspec index 11e969cab6..b94c5e7601 100644 --- a/FirebaseGoogleAuthUI.podspec +++ b/FirebaseGoogleAuthUI.podspec @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.source_files = 'FirebaseGoogleAuthUI/Sources/**/*.{h,m}' s.dependency 'FirebaseAuth' s.dependency 'FirebaseCore' - s.dependency 'FirebaseAuthUI' + s.dependency 'FirebaseAuthUI', '>= 14.2' s.dependency 'GoogleSignIn', '~> 7.0' s.resource_bundles = { 'FirebaseGoogleAuthUI' => ['FirebaseGoogleAuthUI/Sources/{Resources,Strings}/*.{png,lproj}'] diff --git a/FirebasePhoneAuthUI.podspec b/FirebasePhoneAuthUI.podspec index 86c2de4f3d..9859ed2488 100644 --- a/FirebasePhoneAuthUI.podspec +++ b/FirebasePhoneAuthUI.podspec @@ -19,7 +19,7 @@ Pod::Spec.new do |s| s.public_header_files = 'FirebasePhoneAuthUI/Sources/Public/FirebasePhoneAuthUI/*.h' s.source_files = 'FirebasePhoneAuthUI/Sources/**/*.{h,m}' s.dependency 'FirebaseAuth' - s.dependency 'FirebaseAuthUI' + s.dependency 'FirebaseAuthUI', '>= 14.2' s.resource_bundles = { 'FirebasePhoneAuthUI' => ['FirebasePhoneAuthUI/Sources/{Resources,Strings}/*.{xib,json,lproj,png}'] } diff --git a/FirebaseUI.podspec b/FirebaseUI.podspec index 7294b06668..521bc47f74 100644 --- a/FirebaseUI.podspec +++ b/FirebaseUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseUI' - s.version = '14.1.0' + s.version = '14.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' } @@ -19,43 +19,43 @@ Pod::Spec.new do |s| } s.subspec 'Database' do |database| - database.dependency 'FirebaseDatabaseUI', '~> 14.0' + database.dependency 'FirebaseDatabaseUI', '~> 14.2' end s.subspec 'Firestore' do |firestore| - firestore.dependency 'FirebaseFirestoreUI', '~> 14.0' + firestore.dependency 'FirebaseFirestoreUI', '~> 14.2' end s.subspec 'Storage' do |storage| - storage.dependency 'FirebaseStorageUI', '~> 14.0' + storage.dependency 'FirebaseStorageUI', '~> 14.2' end s.subspec 'Auth' do |auth| - auth.dependency 'FirebaseAuthUI', '~> 14.0' + auth.dependency 'FirebaseAuthUI', '~> 14.2' end s.subspec 'Anonymous' do |anonymous| - anonymous.dependency 'FirebaseAnonymousAuthUI', '~> 14.0' + anonymous.dependency 'FirebaseAnonymousAuthUI', '~> 14.2' end s.subspec 'Email' do |email| - email.dependency 'FirebaseEmailAuthUI', '~> 14.0' + email.dependency 'FirebaseEmailAuthUI', '~> 14.2' end s.subspec 'Facebook' do |facebook| - facebook.dependency 'FirebaseFacebookAuthUI', '~> 14.0' + facebook.dependency 'FirebaseFacebookAuthUI', '~> 14.2' end s.subspec 'Google' do |google| - google.dependency 'FirebaseGoogleAuthUI', '~> 14.0' + google.dependency 'FirebaseGoogleAuthUI', '~> 14.2' end s.subspec 'OAuth' do |oauth| - oauth.dependency 'FirebaseOAuthUI', '~> 14.0' + oauth.dependency 'FirebaseOAuthUI', '~> 14.2' end s.subspec 'Phone' do |phone| - phone.dependency 'FirebasePhoneAuthUI', '~> 14.0' + phone.dependency 'FirebasePhoneAuthUI', '~> 14.2' end end diff --git a/release.sh b/release.sh index eb6f560dd8..1effe72cfc 100755 --- a/release.sh +++ b/release.sh @@ -3,28 +3,28 @@ set -euxo pipefail pod spec lint FirebaseDatabaseUI.podspec && \ - pod spec lint FirebaseAuthUI.podspec && \ + pod spec lint --allow-warnings FirebaseAuthUI.podspec && \ pod spec lint FirebaseStorageUI.podspec && \ pod spec lint FirebaseFirestoreUI.podspec pod trunk push FirebaseDatabaseUI.podspec && \ - pod trunk push FirebaseAuthUI.podspec && \ + pod trunk push --allow-warnings FirebaseAuthUI.podspec && \ pod trunk push FirebaseStorageUI.podspec && \ pod trunk push FirebaseFirestoreUI.podspec pod spec lint FirebaseAnonymousAuthUI.podspec && \ - pod spec lint FirebaseEmailAuthUI.podspec && \ + pod spec lint --allow-warnings FirebaseEmailAuthUI.podspec && \ pod spec lint FirebaseFacebookAuthUI.podspec && \ pod spec lint FirebaseGoogleAuthUI.podspec && \ pod spec lint FirebaseOAuthUI.podspec && \ - pod spec lint FirebasePhoneAuthUI.podspec + pod spec lint --allow-warnings FirebasePhoneAuthUI.podspec pod trunk push FirebaseAnonymousAuthUI.podspec && \ - pod trunk push FirebaseEmailAuthUI.podspec && \ + pod trunk push --allow-warnings FirebaseEmailAuthUI.podspec && \ pod trunk push FirebaseFacebookAuthUI.podspec && \ pod trunk push FirebaseGoogleAuthUI.podspec && \ pod trunk push FirebaseOAuthUI.podspec && \ - pod trunk push FirebasePhoneAuthUI.podspec + pod trunk push --allow-warnings FirebasePhoneAuthUI.podspec pod spec lint FirebaseUI.podspec && \ pod trunk push FirebaseUI.podspec diff --git a/staging.sh b/staging.sh new file mode 100755 index 0000000000..cd42c5a362 --- /dev/null +++ b/staging.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +set -euxo pipefail + +pod repo push --use-json spec-staging FirebaseDatabaseUI.podspec && \ + pod repo push --use-json --allow-warnings spec-staging FirebaseAuthUI.podspec && \ + pod repo push --use-json spec-staging FirebaseStorageUI.podspec && \ + pod repo push --use-json spec-staging FirebaseFirestoreUI.podspec + +pod repo push --use-json spec-staging FirebaseAnonymousAuthUI.podspec && \ + pod repo push --use-json --allow-warnings spec-staging FirebaseEmailAuthUI.podspec && \ + pod repo push --use-json spec-staging FirebaseFacebookAuthUI.podspec && \ + pod repo push --use-json spec-staging FirebaseGoogleAuthUI.podspec && \ + pod repo push --use-json spec-staging FirebaseOAuthUI.podspec && \ + pod repo push --use-json --allow-warnings spec-staging FirebasePhoneAuthUI.podspec + +pod spec lint FirebaseUI.podspec && \ + pod repo push --use-json spec-staging FirebaseUI.podspec