Merge pull request #1140 from firebase/mc/fixes

morganchen12 · web-flow · commit 74a4db326ca4 · 2023-03-27T09:40:03.000-07:00
update facebook pod
diff --git 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@main
       - name: Setup
         run: |
           cd FirebaseAnonymousAuthUI
@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: List
         run: |
           xcodebuild -list
@@ -61,7 +61,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        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
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: Setup
         run: |
           cd FirebaseAuthUI
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: List
         run: |
           xcodebuild -list
@@ -57,7 +57,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        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
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: Setup
         run: |
           cd FirebaseDatabaseUI
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: List
         run: |
           xcodebuild -list
@@ -57,7 +57,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        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
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: Setup
         run: |
           cd FirebaseEmailAuthUI
@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: List
         run: |
           xcodebuild -list
@@ -61,7 +61,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        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
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: Setup
         run: |
           cd FirebaseFacebookAuthUI
@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: List
         run: |
           xcodebuild -list
@@ -61,7 +61,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        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
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: Setup
         run: |
           cd FirebaseFirestoreUI
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: List
         run: |
           xcodebuild -list
@@ -57,7 +57,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        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
@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: Setup
         run: |
           cd FirebaseGoogleAuthUI
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: List
         run: |
           xcodebuild -list
@@ -59,7 +59,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        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
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: Setup
         run: |
           cd FirebaseOAuthUI
@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: List
         run: |
           xcodebuild -list
@@ -61,7 +61,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        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
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: Setup
         run: |
           cd FirebasePhoneAuthUI
@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: List
         run: |
           xcodebuild -list
@@ -61,7 +61,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        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
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: Setup
         run: |
           cd samples/swift
@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        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
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: Setup
         run: |
           cd FirebaseStorageUI
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: List
         run: |
           xcodebuild -list
@@ -57,7 +57,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: Setup
         run: gem install bundler; bundle install
       - name: Build
diff --git a/FirebaseFacebookAuthUI.podspec b/FirebaseFacebookAuthUI.podspec
@@ -17,13 +17,13 @@ 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'
   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/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 <OCMock/OCMock.h>
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 
-@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
diff --git 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/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
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/Package.swift b/Package.swift
diff --git a/samples/objc/Podfile b/samples/objc/Podfile
