From 2ed7089eb984be9c0523aae6fd86747a0915c906 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Fri, 24 Mar 2023 15:56:07 -0400 Subject: [PATCH 1/6] update facebook pod --- FirebaseFacebookAuthUI.podspec | 2 +- FirebaseFacebookAuthUI/Podfile | 2 +- FirebaseFacebookAuthUI/Podfile.lock | 64 ++++++++++++++--------------- Package.swift | 2 +- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/FirebaseFacebookAuthUI.podspec b/FirebaseFacebookAuthUI.podspec index c507ddc5276..533e1ed4f94 100644 --- a/FirebaseFacebookAuthUI.podspec +++ b/FirebaseFacebookAuthUI.podspec @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.dependency 'FirebaseAuth' s.dependency 'FirebaseCore' s.dependency 'FirebaseAuthUI' - s.dependency 'FBSDKLoginKit', '>= 11.0', '< 15.0' + s.dependency 'FBSDKLoginKit', '>= 11.0', '< 16.0' s.dependency 'FBSDKCoreKit_Basics' s.resource_bundles = { 'FirebaseFacebookAuthUI' => ['FirebaseFacebookAuthUI/Sources/{Resources,Strings}/*.{png,lproj}'] diff --git a/FirebaseFacebookAuthUI/Podfile b/FirebaseFacebookAuthUI/Podfile index 346009d2bb7..7069505e288 100644 --- a/FirebaseFacebookAuthUI/Podfile +++ b/FirebaseFacebookAuthUI/Podfile @@ -9,7 +9,7 @@ target 'FirebaseFacebookAuthUI' do # The facebook pods generate an unreasonable number of warnings. inhibit_all_warnings! - pod 'FBSDKLoginKit', '~> 13.0' + pod 'FBSDKLoginKit', '~> 15.0' pod 'FBSDKCoreKit' pod 'FirebaseAuthUI', :path => '../' diff --git a/FirebaseFacebookAuthUI/Podfile.lock b/FirebaseFacebookAuthUI/Podfile.lock index 3b62ecd4684..5f1bbe04be3 100644 --- a/FirebaseFacebookAuthUI/Podfile.lock +++ b/FirebaseFacebookAuthUI/Podfile.lock @@ -1,13 +1,13 @@ PODS: - - FBAEMKit (13.2.0): - - FBSDKCoreKit_Basics (= 13.2.0) - - FBSDKCoreKit (13.2.0): - - FBAEMKit (= 13.2.0) - - FBSDKCoreKit_Basics (= 13.2.0) - - FBSDKCoreKit_Basics (13.2.0) - - FBSDKLoginKit (13.2.0): - - FBSDKCoreKit (= 13.2.0) - - FirebaseAuth (10.2.0): + - FBAEMKit (15.1.0): + - FBSDKCoreKit_Basics (= 15.1.0) + - FBSDKCoreKit (15.1.0): + - FBAEMKit (= 15.1.0) + - FBSDKCoreKit_Basics (= 15.1.0) + - FBSDKCoreKit_Basics (15.1.0) + - FBSDKLoginKit (15.1.0): + - FBSDKCoreKit (= 15.1.0) + - FirebaseAuth (10.7.0): - FirebaseCore (~> 10.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - GoogleUtilities/Environment (~> 7.8) @@ -15,34 +15,34 @@ PODS: - FirebaseAuthUI (12.3.0): - FirebaseAuth (< 11.0, >= 8.0) - FirebaseCore - - FirebaseCore (10.2.0): + - FirebaseCore (10.7.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/Logger (~> 7.8) - - FirebaseCoreInternal (10.2.0): + - FirebaseCoreInternal (10.7.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - - GoogleUtilities/AppDelegateSwizzler (7.10.0): + - GoogleUtilities/AppDelegateSwizzler (7.11.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.10.0): + - GoogleUtilities/Environment (7.11.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.10.0): + - GoogleUtilities/Logger (7.11.0): - GoogleUtilities/Environment - - GoogleUtilities/Network (7.10.0): + - GoogleUtilities/Network (7.11.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.10.0)" - - GoogleUtilities/Reachability (7.10.0): + - "GoogleUtilities/NSData+zlib (7.11.0)" + - GoogleUtilities/Reachability (7.11.0): - GoogleUtilities/Logger - - GTMSessionFetcher/Core (3.0.0) + - GTMSessionFetcher/Core (3.1.0) - OCMock (3.9.1) - - PromisesObjC (2.1.1) + - PromisesObjC (2.2.0) DEPENDENCIES: - FBSDKCoreKit - - FBSDKLoginKit (~> 13.0) + - FBSDKLoginKit (~> 15.0) - FirebaseAuthUI (from `../`) - OCMock @@ -65,19 +65,19 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - FBAEMKit: c2b2895363b7e57192013d1dc49fdf498b28624c - FBSDKCoreKit: 58139803d861e72c7661dc875611a759352a55ac - FBSDKCoreKit_Basics: 1ffc68326a5ece051d85574f02a0adcf27c2a5f2 - FBSDKLoginKit: 19e2a878556c2ee4f20486dc406e582783cd7578 - FirebaseAuth: 08e7739244eeae5216d0a3f8d9f16a76be9c252e + FBAEMKit: c7f82b5145d446bcbbcd50485c032689032fc6a2 + FBSDKCoreKit: 7542746fc63a2a38dd6a865eeb54268341f37b83 + FBSDKCoreKit_Basics: 92d6b26c0bed30ab09bbdd96dccaa26e6c9978d1 + FBSDKLoginKit: 4e275d30cf90e92bdf3a7c82857a8642abf23037 + FirebaseAuth: dd64c01631df724b09f33e584625775c52f7d71f FirebaseAuthUI: 9fa83d7dd7bad0f0eb20a9682f7e649c98e8f644 - FirebaseCore: 813838072b797b64f529f3c2ee35e696e5641dd1 - FirebaseCoreInternal: 091bde13e47bb1c5e9fe397634f3593dc390430f - GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95 - GTMSessionFetcher: c1edebe64e9fb4e8f6415d018edf1fd3eac074a1 + FirebaseCore: e317665b9d744727a97e623edbbed009320afdd7 + FirebaseCoreInternal: 8845798510aae74703467480f71ac613788d0696 + GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f + GTMSessionFetcher: c9e714f7eec91a55641e2bab9f45fd83a219b882 OCMock: 9491e4bec59e0b267d52a9184ff5605995e74be8 - PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb + PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef -PODFILE CHECKSUM: 458aa6777101b96290e6428644bc8c78a54f2daa +PODFILE CHECKSUM: b4d60bac6e2f77e8a5e989ee6de7d1c4b6744e8a -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.0 diff --git a/Package.swift b/Package.swift index b8668cff205..6b593a93e67 100644 --- a/Package.swift +++ b/Package.swift @@ -67,7 +67,7 @@ let package = Package( .package( name: "Facebook", url: "https://github.com/facebook/facebook-ios-sdk.git", - "11.0.0"..<"15.0.0" + "11.0.0"..<"16.0.0" ), .package( name: "Firebase", From f466919cc5443eb60ea8beee5630285f3dc08a2e Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Fri, 24 Mar 2023 16:46:45 -0400 Subject: [PATCH 2/6] fix failing tests --- .../FUIFacebookAuthTest.m | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/FirebaseFacebookAuthUI/FirebaseFacebookAuthUITests/FUIFacebookAuthTest.m b/FirebaseFacebookAuthUI/FirebaseFacebookAuthUITests/FUIFacebookAuthTest.m index 82830b780bd..98f89ef682d 100644 --- a/FirebaseFacebookAuthUI/FirebaseFacebookAuthUITests/FUIFacebookAuthTest.m +++ b/FirebaseFacebookAuthUI/FirebaseFacebookAuthUITests/FUIFacebookAuthTest.m @@ -13,33 +13,35 @@ // See the License for the specific language governing permissions and // limitations under the License. // + #import "FUIFacebookAuthTest.h" +#import #import -@interface FBSDKLoginManagerTest : FBSDKLoginManager +@interface FUIFacebookAuthTest () @property(nonatomic) FBSDKLoginManagerLoginResult *result; @property(nonatomic) NSError *error; @end -@implementation FBSDKLoginManagerTest - -- (void)logInWithPermissions:(NSArray *)permissions - fromViewController:(UIViewController *)fromViewController - handler:(FBSDKLoginManagerLoginResultBlock)handler { - handler(self.result, self.error); -} -@end - - @implementation FUIFacebookAuthTest - (FBSDKLoginManager *)createLoginManager { - return [[FBSDKLoginManagerTest alloc] init]; + id mock = OCMClassMock([FBSDKLoginManager class]); + OCMStub( + [mock logInWithPermissions:[OCMArg any] + fromViewController:[OCMArg any] + handler:[OCMArg any]] + ).andDo(^(NSInvocation *invocation) { + void (^completion)(FBSDKLoginManagerLoginResult *, NSError *); + [invocation getArgument:&completion atIndex:4]; + completion(self.result, self.error); + }); + return mock; } - (void)configureLoginManager:(FBSDKLoginManagerLoginResult *)result withError:(NSError *)error { - ((FBSDKLoginManagerTest *)_loginManager).result = result; - ((FBSDKLoginManagerTest *)_loginManager).error = error; + self.result = result; + self.error = error; } @end From dc4553cbe7238446da6576b74d57ce58b752b427 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Mon, 27 Mar 2023 10:13:31 -0400 Subject: [PATCH 3/6] update gems and checkout --- .github/workflows/anonymousauth.yml | 6 +++--- .github/workflows/auth.yml | 6 +++--- .github/workflows/database.yml | 6 +++--- .github/workflows/emailauth.yml | 6 +++--- .github/workflows/facebookauth.yml | 6 +++--- .github/workflows/firestore.yml | 6 +++--- .github/workflows/googleauth.yml | 6 +++--- .github/workflows/oauth.yml | 6 +++--- .github/workflows/phoneauth.yml | 6 +++--- .github/workflows/sample.yml | 4 ++-- .github/workflows/storage.yml | 6 +++--- .../FirebaseFacebookAuthUITests.m | 7 +++++++ Gemfile.lock | 20 +++++++++---------- 13 files changed, 49 insertions(+), 42 deletions(-) diff --git a/.github/workflows/anonymousauth.yml b/.github/workflows/anonymousauth.yml index 36d1f3ebc49..116c9912acf 100644 --- a/.github/workflows/anonymousauth.yml +++ b/.github/workflows/anonymousauth.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: | cd FirebaseAnonymousAuthUI @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: List run: | xcodebuild -list @@ -61,7 +61,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml index f5b2fe2bf6c..d198a2e0ab7 100644 --- a/.github/workflows/auth.yml +++ b/.github/workflows/auth.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: | cd FirebaseAuthUI @@ -44,7 +44,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: List run: | xcodebuild -list @@ -57,7 +57,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 73642c0e54e..3256743a201 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: | cd FirebaseDatabaseUI @@ -44,7 +44,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: List run: | xcodebuild -list @@ -57,7 +57,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/emailauth.yml b/.github/workflows/emailauth.yml index 97ea9e796e1..76abba4d5eb 100644 --- a/.github/workflows/emailauth.yml +++ b/.github/workflows/emailauth.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: | cd FirebaseEmailAuthUI @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: List run: | xcodebuild -list @@ -61,7 +61,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/facebookauth.yml b/.github/workflows/facebookauth.yml index c945f0ad140..335f2a4898e 100644 --- a/.github/workflows/facebookauth.yml +++ b/.github/workflows/facebookauth.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: | cd FirebaseFacebookAuthUI @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: List run: | xcodebuild -list @@ -61,7 +61,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml index 3342cf2bab3..e724da6849a 100644 --- a/.github/workflows/firestore.yml +++ b/.github/workflows/firestore.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: | cd FirebaseFirestoreUI @@ -44,7 +44,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: List run: | xcodebuild -list @@ -57,7 +57,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/googleauth.yml b/.github/workflows/googleauth.yml index 2b2a0fdd864..302a9be1100 100644 --- a/.github/workflows/googleauth.yml +++ b/.github/workflows/googleauth.yml @@ -29,7 +29,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: | cd FirebaseGoogleAuthUI @@ -46,7 +46,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: List run: | xcodebuild -list @@ -59,7 +59,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/oauth.yml b/.github/workflows/oauth.yml index aaabb6a7c83..f52207813d5 100644 --- a/.github/workflows/oauth.yml +++ b/.github/workflows/oauth.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: | cd FirebaseOAuthUI @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: List run: | xcodebuild -list @@ -61,7 +61,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/phoneauth.yml b/.github/workflows/phoneauth.yml index 8dd370e5d57..2166e748850 100644 --- a/.github/workflows/phoneauth.yml +++ b/.github/workflows/phoneauth.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: | cd FirebasePhoneAuthUI @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: List run: | xcodebuild -list @@ -61,7 +61,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index 09289de0d08..3a4949bcb4f 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: | cd samples/swift @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: | cp samples/GoogleService-Info-dummy.plist samples/swift/GoogleService-Info.plist diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 2b180d05f6a..de7cfaabb63 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: | cd FirebaseStorageUI @@ -44,7 +44,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: List run: | xcodebuild -list @@ -57,7 +57,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@latest - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/FirebaseFacebookAuthUI/FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m b/FirebaseFacebookAuthUI/FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m index 45f15428c74..13b57af8ec2 100644 --- a/FirebaseFacebookAuthUI/FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m +++ b/FirebaseFacebookAuthUI/FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m @@ -35,6 +35,13 @@ @interface FirebaseFacebookAuthUITests : XCTestCase @implementation FirebaseFacebookAuthUITests ++ (void)initialize { + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + [[FBSDKSettings sharedSettings] setAppID:@"0000000"]; + }); +} + - (void)setUp { [super setUp]; diff --git a/Gemfile.lock b/Gemfile.lock index 84e8c629203..5044b5c2c7b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.5) + CFPropertyList (3.0.6) rexml activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) @@ -16,15 +16,15 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.1.0) - cocoapods (1.11.3) + cocoapods (1.12.0) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.11.3) + cocoapods-core (= 1.12.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.4.0, < 2.0) + cocoapods-downloader (>= 1.6.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.4.0, < 2.0) + cocoapods-trunk (>= 1.6.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) @@ -32,10 +32,10 @@ GEM gh_inspector (~> 1.0) molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (>= 1.0, < 3.0) + ruby-macho (>= 2.3.0, < 3.0) xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.11.3) - activesupport (>= 5.0, < 7) + cocoapods-core (1.12.0) + activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) @@ -65,7 +65,7 @@ GEM httpclient (2.8.3) i18n (1.12.0) concurrent-ruby (~> 1.0) - json (2.6.2) + json (2.6.3) minitest (5.18.0) molinillo (0.8.0) nanaimo (0.3.0) @@ -96,4 +96,4 @@ DEPENDENCIES xcodeproj BUNDLED WITH - 2.3.25 + 2.4.10 From f107fbb454201dedcafd574616875e03a5dbd34a Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Mon, 27 Mar 2023 10:17:48 -0400 Subject: [PATCH 4/6] oops --- .github/workflows/anonymousauth.yml | 6 +++--- .github/workflows/auth.yml | 6 +++--- .github/workflows/database.yml | 6 +++--- .github/workflows/emailauth.yml | 6 +++--- .github/workflows/facebookauth.yml | 6 +++--- .github/workflows/firestore.yml | 6 +++--- .github/workflows/googleauth.yml | 6 +++--- .github/workflows/oauth.yml | 6 +++--- .github/workflows/phoneauth.yml | 6 +++--- .github/workflows/sample.yml | 4 ++-- .github/workflows/storage.yml | 6 +++--- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/anonymousauth.yml b/.github/workflows/anonymousauth.yml index 116c9912acf..247c554f96e 100644 --- a/.github/workflows/anonymousauth.yml +++ b/.github/workflows/anonymousauth.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: | cd FirebaseAnonymousAuthUI @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: List run: | xcodebuild -list @@ -61,7 +61,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml index d198a2e0ab7..62eb1659b33 100644 --- a/.github/workflows/auth.yml +++ b/.github/workflows/auth.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: | cd FirebaseAuthUI @@ -44,7 +44,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: List run: | xcodebuild -list @@ -57,7 +57,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 3256743a201..55b1555593f 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: | cd FirebaseDatabaseUI @@ -44,7 +44,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: List run: | xcodebuild -list @@ -57,7 +57,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/emailauth.yml b/.github/workflows/emailauth.yml index 76abba4d5eb..03ff77a3ad8 100644 --- a/.github/workflows/emailauth.yml +++ b/.github/workflows/emailauth.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: | cd FirebaseEmailAuthUI @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: List run: | xcodebuild -list @@ -61,7 +61,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/facebookauth.yml b/.github/workflows/facebookauth.yml index 335f2a4898e..8353c8dc738 100644 --- a/.github/workflows/facebookauth.yml +++ b/.github/workflows/facebookauth.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: | cd FirebaseFacebookAuthUI @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: List run: | xcodebuild -list @@ -61,7 +61,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml index e724da6849a..afba9b8fb62 100644 --- a/.github/workflows/firestore.yml +++ b/.github/workflows/firestore.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: | cd FirebaseFirestoreUI @@ -44,7 +44,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: List run: | xcodebuild -list @@ -57,7 +57,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/googleauth.yml b/.github/workflows/googleauth.yml index 302a9be1100..b6f93cb59ba 100644 --- a/.github/workflows/googleauth.yml +++ b/.github/workflows/googleauth.yml @@ -29,7 +29,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: | cd FirebaseGoogleAuthUI @@ -46,7 +46,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: List run: | xcodebuild -list @@ -59,7 +59,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/oauth.yml b/.github/workflows/oauth.yml index f52207813d5..1d7bfc8e754 100644 --- a/.github/workflows/oauth.yml +++ b/.github/workflows/oauth.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: | cd FirebaseOAuthUI @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: List run: | xcodebuild -list @@ -61,7 +61,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/phoneauth.yml b/.github/workflows/phoneauth.yml index 2166e748850..9d1620b7313 100644 --- a/.github/workflows/phoneauth.yml +++ b/.github/workflows/phoneauth.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: | cd FirebasePhoneAuthUI @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: List run: | xcodebuild -list @@ -61,7 +61,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: gem install bundler; bundle install - name: Build diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index 3a4949bcb4f..94019f5f979 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: | cd samples/swift @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: | cp samples/GoogleService-Info-dummy.plist samples/swift/GoogleService-Info.plist diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index de7cfaabb63..1bd163ec265 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: | cd FirebaseStorageUI @@ -44,7 +44,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: List run: | xcodebuild -list @@ -57,7 +57,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@latest + uses: actions/checkout@main - name: Setup run: gem install bundler; bundle install - name: Build From a3ebce88cdf800ee2b11d4b5ce21493c0aad48e9 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Mon, 27 Mar 2023 10:53:54 -0400 Subject: [PATCH 5/6] bump min version --- FirebaseFacebookAuthUI.podspec | 2 +- Package.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FirebaseFacebookAuthUI.podspec b/FirebaseFacebookAuthUI.podspec index 533e1ed4f94..5a60ba581fd 100644 --- a/FirebaseFacebookAuthUI.podspec +++ b/FirebaseFacebookAuthUI.podspec @@ -17,7 +17,7 @@ Pod::Spec.new do |s| } s.swift_version = '5.3' - s.platform = :ios, '10.0' + s.platform = :ios, '12.0' s.public_header_files = 'FirebaseFacebookAuthUI/Sources/Public/FirebaseFacebookAuthUI/*.h' s.source_files = 'FirebaseFacebookAuthUI/Sources/**/*.{h,m}' s.dependency 'FirebaseAuth' diff --git a/Package.swift b/Package.swift index 6b593a93e67..d585b80af1d 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ import PackageDescription let package = Package( name: "FirebaseUI", defaultLocalization: "en", - platforms: [.iOS(.v11)], + platforms: [.iOS(.v12)], products: [ .library( name: "FirebaseAnonymousAuthUI", From 533a5889ae83869878ac5a7cba72e38625751465 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Mon, 27 Mar 2023 11:21:12 -0400 Subject: [PATCH 6/6] update sample taraget --- samples/objc/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/objc/Podfile b/samples/objc/Podfile index 0746c36badf..4fad22eab3a 100644 --- a/samples/objc/Podfile +++ b/samples/objc/Podfile @@ -1,4 +1,4 @@ -platform :ios, '10.0' +platform :ios, '12.0' target 'FirebaseUI-demo-objc' do use_frameworks!