Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update facebook pod #1140

Merged
merged 6 commits into from
Mar 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/anonymousauth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: Setup
run: |
cd FirebaseAnonymousAuthUI
Expand All @@ -48,7 +48,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: List
run: |
xcodebuild -list
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: Setup
run: |
cd FirebaseAuthUI
Expand All @@ -44,7 +44,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: List
run: |
xcodebuild -list
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: Setup
run: |
cd FirebaseDatabaseUI
Expand All @@ -44,7 +44,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: List
run: |
xcodebuild -list
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/emailauth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: Setup
run: |
cd FirebaseEmailAuthUI
Expand All @@ -48,7 +48,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: List
run: |
xcodebuild -list
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/facebookauth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: Setup
run: |
cd FirebaseFacebookAuthUI
Expand All @@ -48,7 +48,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: List
run: |
xcodebuild -list
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/firestore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: Setup
run: |
cd FirebaseFirestoreUI
Expand All @@ -44,7 +44,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: List
run: |
xcodebuild -list
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/googleauth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: Setup
run: |
cd FirebaseGoogleAuthUI
Expand All @@ -46,7 +46,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: List
run: |
xcodebuild -list
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/oauth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: Setup
run: |
cd FirebaseOAuthUI
Expand All @@ -48,7 +48,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: List
run: |
xcodebuild -list
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/phoneauth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: Setup
run: |
cd FirebasePhoneAuthUI
Expand All @@ -48,7 +48,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: List
run: |
xcodebuild -list
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sample.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: Setup
run: |
cd samples/swift
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: Setup
run: |
cd FirebaseStorageUI
Expand All @@ -44,7 +44,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@main
- name: List
run: |
xcodebuild -list
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions FirebaseFacebookAuthUI.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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}']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down
2 changes: 1 addition & 1 deletion FirebaseFacebookAuthUI/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 => '../'
Expand Down
Loading