Skip to content

Commit

Permalink
Various release updates (#1194)
Browse files Browse the repository at this point in the history
  • Loading branch information
paulb777 authored Jul 24, 2024
1 parent 1262e17 commit e3dbca5
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 31 deletions.
2 changes: 1 addition & 1 deletion FirebaseAnonymousAuthUI.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuthUI/Sources/FUIAuthBaseViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -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)];
Expand Down
9 changes: 1 addition & 8 deletions FirebaseAuthUI/Sources/FUIAuthPickerViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion FirebaseEmailAuthUI.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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}']
Expand Down
2 changes: 1 addition & 1 deletion FirebaseFacebookAuthUI.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion FirebaseGoogleAuthUI.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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}']
Expand Down
2 changes: 1 addition & 1 deletion FirebasePhoneAuthUI.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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}']
}
Expand Down
22 changes: 11 additions & 11 deletions FirebaseUI.podspec
Original file line number Diff line number Diff line change
@@ -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' }
Expand All @@ -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
12 changes: 6 additions & 6 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 18 additions & 0 deletions staging.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit e3dbca5

Please sign in to comment.