Skip to content

Commit bdfd754

Browse files
morganchen12morganchen12
authored
Merge pull request #978 from firebase/mc/fb
Update Facebook to 11
2 parents fc7c27f + e9a9cf2 commit bdfd754

File tree

7 files changed

+83
-66
lines changed

7 files changed

+83
-66
lines changed

‎FirebaseFacebookAuthUI.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'FirebaseFacebookAuthUI'
3-
s.version = '11.0.3'
3+
s.version = '11.1.3'
44
s.summary = 'A Facebook auth provider for FirebaseAuthUI.'
55
s.homepage = 'https://github.com/firebase/FirebaseUI-iOS'
66
s.license = { :type => 'Apache 2.0', :file => 'LICENSE' }
@@ -22,8 +22,8 @@ Pod::Spec.new do |s|
2222
s.dependency 'FirebaseAuth'
2323
s.dependency 'FirebaseCore'
2424
s.dependency 'FirebaseAuthUI'
25-
s.dependency 'FBSDKLoginKit', '~> 9.0'
26-
s.dependency 'FBSDKCoreKit'
25+
s.dependency 'FBSDKLoginKit', '~> 11.0'
26+
s.dependency 'FBSDKCoreKit_Basics'
2727
s.resource_bundles = {
2828
'FirebaseFacebookAuthUI' => ['FirebaseFacebookAuthUI/Sources/{Resources,Strings}/*.{png,lproj}']
2929
}

‎FirebaseFacebookAuthUI/FirebaseFacebookAuthUI.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@
772772
"$(inherited)",
773773
"@executable_path/Frameworks",
774774
"@loader_path/Frameworks",
775-
"\"${PODS_CONFIGURATION_BUILD_DIR}/FBSDKCoreKit\"",
775+
"\"${PODS_CONFIGURATION_BUILD_DIR}/FBSDKCoreKit_Basics\"",
776776
"\"${PODS_CONFIGURATION_BUILD_DIR}/FBSDKLoginKit\"",
777777
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"",
778778
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"",
@@ -784,6 +784,7 @@
784784
"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
785785
"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
786786
"\"$(PODS_CONFIGURATION_BUILD_DIR)/FirebaseAuthUI\"",
787+
"\"${PODS_CONFIGURATION_BUILD_DIR}/FBSDKCoreKit\"",
787788
);
788789
OTHER_LDFLAGS = (
789790
"$(inherited)",
@@ -822,7 +823,7 @@
822823
"$(inherited)",
823824
"@executable_path/Frameworks",
824825
"@loader_path/Frameworks",
825-
"\"${PODS_CONFIGURATION_BUILD_DIR}/FBSDKCoreKit\"",
826+
"\"${PODS_CONFIGURATION_BUILD_DIR}/FBSDKCoreKit_Basics\"",
826827
"\"${PODS_CONFIGURATION_BUILD_DIR}/FBSDKLoginKit\"",
827828
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"",
828829
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"",
@@ -834,6 +835,7 @@
834835
"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
835836
"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
836837
"\"$(PODS_CONFIGURATION_BUILD_DIR)/FirebaseAuthUI\"",
838+
"\"${PODS_CONFIGURATION_BUILD_DIR}/FBSDKCoreKit\"",
837839
);
838840
OTHER_LDFLAGS = (
839841
"$(inherited)",

‎FirebaseFacebookAuthUI/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ target 'FirebaseFacebookAuthUI' do
99
# The facebook pods generate an unreasonable number of warnings.
1010
inhibit_all_warnings!
1111

12-
pod 'FBSDKLoginKit', '~> 9.0'
12+
pod 'FBSDKLoginKit', '~> 11.0'
1313
pod 'FBSDKCoreKit'
1414

1515
pod 'FirebaseAuthUI', :path => '../'

‎FirebaseFacebookAuthUI/Podfile.lock

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
PODS:
2-
- FBSDKCoreKit (9.3.0):
3-
- FBSDKCoreKit/Basics (= 9.3.0)
4-
- FBSDKCoreKit/Core (= 9.3.0)
5-
- FBSDKCoreKit/Basics (9.3.0)
6-
- FBSDKCoreKit/Core (9.3.0):
7-
- FBSDKCoreKit/Basics
8-
- FBSDKLoginKit (9.3.0):
9-
- FBSDKLoginKit/Login (= 9.3.0)
10-
- FBSDKLoginKit/Login (9.3.0):
11-
- FBSDKCoreKit (~> 9.3.0)
2+
- FBSDKCoreKit (11.0.1):
3+
- FBSDKCoreKit/Core (= 11.0.1)
4+
- FBSDKCoreKit/Core (11.0.1):
5+
- FBSDKCoreKit_Basics (~> 11.0.1)
6+
- FBSDKCoreKit_Basics (11.0.1):
7+
- FBSDKCoreKit_Basics/Basics (= 11.0.1)
8+
- FBSDKCoreKit_Basics/Basics (11.0.1)
9+
- FBSDKLoginKit (11.0.1):
10+
- FBSDKLoginKit/Login (= 11.0.1)
11+
- FBSDKLoginKit/Login (11.0.1):
12+
- FBSDKCoreKit (~> 11.0.1)
13+
- FBSDKCoreKit_Basics (~> 11.0.1)
1214
- FirebaseAuth (8.2.0):
1315
- FirebaseCore (~> 8.0)
1416
- GoogleUtilities/AppDelegateSwizzler (~> 7.4)
@@ -56,13 +58,14 @@ PODS:
5658

5759
DEPENDENCIES:
5860
- FBSDKCoreKit
59-
- FBSDKLoginKit (~> 9.0)
61+
- FBSDKLoginKit (~> 11.0)
6062
- FirebaseAuthUI (from `../`)
6163
- OCMock
6264

6365
SPEC REPOS:
6466
https://github.com/CocoaPods/Specs.git:
6567
- FBSDKCoreKit
68+
- FBSDKCoreKit_Basics
6669
- FBSDKLoginKit
6770
- FirebaseAuth
6871
- FirebaseCore
@@ -79,8 +82,9 @@ EXTERNAL SOURCES:
7982
:path: "../"
8083

8184
SPEC CHECKSUMS:
82-
FBSDKCoreKit: 0d1ae58388a458b8222f72025804cdc84eb5d0c3
83-
FBSDKLoginKit: aea68df6121c5e165ccae2fabfdc83c4644ee40f
85+
FBSDKCoreKit: 38c9e29a3f1436362acacff6486d3a28628c288f
86+
FBSDKCoreKit_Basics: 06780a4a12e16596bde8406add02c6aa1bf38616
87+
FBSDKLoginKit: 8243e04c590c38b85c69fcf09d1234514d2475c3
8488
FirebaseAuth: 4c4fb0ba1a169f3acb4aa5b724f7ae7c0999ee44
8589
FirebaseAuthUI: 3f6dcb6f9e1af8e889916e2e0f0f971a70c2d303
8690
FirebaseCore: 3a83f24c3de69ec9f9a426e2598125ea51f3a2ce
@@ -92,6 +96,6 @@ SPEC CHECKSUMS:
9296
OCMock: 29f6e52085b4e7d9b075cbf03ed7c3112f82f934
9397
PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
9498

95-
PODFILE CHECKSUM: 37de2e61722878ccc8e5a1f1debb0333503e90c0
99+
PODFILE CHECKSUM: 99ac75a904a7560900a9eec61c273bfb283b6ff4
96100

97101
COCOAPODS: 1.10.1

‎FirebaseFacebookAuthUI/Sources/FUIFacebookAuth.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,9 @@ - (void)signInWithDefaultValue:(nullable NSString *)defaultValue
205205
[self completeSignInFlowWithAccessToken:nil error:newError];
206206
} else {
207207
// Retrieve email.
208-
[[[FBSDKGraphRequest alloc] initWithGraphPath:@"me" parameters:@{ @"fields" : @"email" }]
209-
startWithCompletionHandler:^(FBSDKGraphRequestConnection *connection, id result,
210-
NSError *error) {
208+
[[[FBSDKGraphRequest alloc] initWithGraphPath:@"me" parameters:@{ @"fields" : @"email" }] startWithCompletion:^(id<FBSDKGraphRequestConnecting> connection,
209+
id result,
210+
NSError *error) {
211211
self->_email = result[@"email"];
212212
}];
213213
[self completeSignInFlowWithAccessToken:result.token.tokenString

‎Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ let package = Package(
6363
.package(
6464
name: "Facebook",
6565
url: "https://github.com/facebook/facebook-ios-sdk.git",
66-
from: "9.0.0"
66+
from: "11.0.0"
6767
),
6868
.package(
6969
name: "Firebase",

‎samples/swift/Podfile.lock

Lines changed: 53 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -223,50 +223,56 @@ PODS:
223223
- BoringSSL-GRPC/Implementation (0.0.7):
224224
- BoringSSL-GRPC/Interface (= 0.0.7)
225225
- BoringSSL-GRPC/Interface (0.0.7)
226-
- FBSDKCoreKit (9.3.0):
227-
- FBSDKCoreKit/Basics (= 9.3.0)
228-
- FBSDKCoreKit/Core (= 9.3.0)
229-
- FBSDKCoreKit/Basics (9.3.0)
230-
- FBSDKCoreKit/Core (9.3.0):
231-
- FBSDKCoreKit/Basics
232-
- FBSDKLoginKit (9.3.0):
233-
- FBSDKLoginKit/Login (= 9.3.0)
234-
- FBSDKLoginKit/Login (9.3.0):
235-
- FBSDKCoreKit (~> 9.3.0)
226+
- FBSDKCoreKit (11.0.1):
227+
- FBSDKCoreKit/Core (= 11.0.1)
228+
- FBSDKCoreKit/Core (11.0.1):
229+
- FBSDKCoreKit_Basics (~> 11.0.1)
230+
- FBSDKCoreKit_Basics (11.0.1):
231+
- FBSDKCoreKit_Basics/Basics (= 11.0.1)
232+
- FBSDKCoreKit_Basics/Basics (11.0.1)
233+
- FBSDKLoginKit (11.0.1):
234+
- FBSDKLoginKit/Login (= 11.0.1)
235+
- FBSDKLoginKit/Login (11.0.1):
236+
- FBSDKCoreKit (~> 11.0.1)
237+
- FBSDKCoreKit_Basics (~> 11.0.1)
236238
- FirebaseAnonymousAuthUI (11.0.3):
237239
- FirebaseAuth (~> 8.0)
238240
- FirebaseAuthUI
239241
- FirebaseCore
240-
- FirebaseAuth (8.0.0):
242+
- FirebaseAuth (8.2.0):
241243
- FirebaseCore (~> 8.0)
242244
- GoogleUtilities/AppDelegateSwizzler (~> 7.4)
243245
- GoogleUtilities/Environment (~> 7.4)
244246
- GTMSessionFetcher/Core (~> 1.5)
245247
- FirebaseAuthUI (11.0.3):
246248
- FirebaseAuth (~> 8.0)
247249
- FirebaseCore
248-
- FirebaseCore (8.0.0):
250+
- FirebaseCore (8.2.0):
249251
- FirebaseCoreDiagnostics (~> 8.0)
250252
- GoogleUtilities/Environment (~> 7.4)
251253
- GoogleUtilities/Logger (~> 7.4)
252-
- FirebaseCoreDiagnostics (8.0.0):
254+
- FirebaseCoreDiagnostics (8.2.0):
253255
- GoogleDataTransport (~> 9.0)
254256
- GoogleUtilities/Environment (~> 7.4)
255257
- GoogleUtilities/Logger (~> 7.4)
256258
- nanopb (~> 2.30908.0)
257-
- FirebaseDatabase (8.0.0):
259+
- FirebaseDatabase (8.2.0):
258260
- FirebaseCore (~> 8.0)
259261
- leveldb-library (~> 1.22)
260262
- FirebaseDatabaseUI (11.0.3):
261263
- FirebaseDatabase (~> 8.0)
262264
- FirebaseEmailAuthUI (11.0.3):
265+
- FirebaseAuth
263266
- FirebaseAuthUI
267+
- FirebaseCore
264268
- GoogleUtilities/UserDefaults
265-
- FirebaseFacebookAuthUI (11.0.3):
269+
- FirebaseFacebookAuthUI (11.1.3):
266270
- FBSDKCoreKit
267-
- FBSDKLoginKit (~> 9.0)
271+
- FBSDKLoginKit (~> 11.0)
272+
- FirebaseAuth
268273
- FirebaseAuthUI
269-
- FirebaseFirestore (8.0.0):
274+
- FirebaseCore
275+
- FirebaseFirestore (8.2.0):
270276
- abseil/algorithm (= 0.20200225.0)
271277
- abseil/base (= 0.20200225.0)
272278
- abseil/memory (= 0.20200225.0)
@@ -281,14 +287,17 @@ PODS:
281287
- FirebaseFirestoreUI (11.0.3):
282288
- FirebaseFirestore (~> 8.0)
283289
- FirebaseGoogleAuthUI (11.0.3):
290+
- FirebaseAuth
284291
- FirebaseAuthUI
292+
- FirebaseCore
285293
- GoogleSignIn (~> 5.0)
286294
- FirebaseOAuthUI (11.0.3):
287295
- FirebaseAuth (~> 8.0)
288296
- FirebaseAuthUI
289297
- FirebasePhoneAuthUI (11.0.3):
298+
- FirebaseAuth
290299
- FirebaseAuthUI
291-
- FirebaseStorage (8.0.0):
300+
- FirebaseStorage (8.2.0):
292301
- FirebaseCore (~> 8.0)
293302
- GTMSessionFetcher/Core (~> 1.5)
294303
- FirebaseStorageUI (11.0.3):
@@ -325,30 +334,30 @@ PODS:
325334
- FirebasePhoneAuthUI (~> 11.0)
326335
- FirebaseUI/Storage (11.0.3):
327336
- FirebaseStorageUI (~> 11.0)
328-
- GoogleDataTransport (9.0.0):
337+
- GoogleDataTransport (9.0.1):
329338
- GoogleUtilities/Environment (~> 7.2)
330339
- nanopb (~> 2.30908.0)
331340
- PromisesObjC (~> 1.2)
332341
- GoogleSignIn (5.0.2):
333342
- AppAuth (~> 1.2)
334343
- GTMAppAuth (~> 1.0)
335344
- GTMSessionFetcher/Core (~> 1.1)
336-
- GoogleUtilities/AppDelegateSwizzler (7.4.1):
345+
- GoogleUtilities/AppDelegateSwizzler (7.4.3):
337346
- GoogleUtilities/Environment
338347
- GoogleUtilities/Logger
339348
- GoogleUtilities/Network
340-
- GoogleUtilities/Environment (7.4.1):
349+
- GoogleUtilities/Environment (7.4.3):
341350
- PromisesObjC (~> 1.2)
342-
- GoogleUtilities/Logger (7.4.1):
351+
- GoogleUtilities/Logger (7.4.3):
343352
- GoogleUtilities/Environment
344-
- GoogleUtilities/Network (7.4.1):
353+
- GoogleUtilities/Network (7.4.3):
345354
- GoogleUtilities/Logger
346355
- "GoogleUtilities/NSData+zlib"
347356
- GoogleUtilities/Reachability
348-
- "GoogleUtilities/NSData+zlib (7.4.1)"
349-
- GoogleUtilities/Reachability (7.4.1):
357+
- "GoogleUtilities/NSData+zlib (7.4.3)"
358+
- GoogleUtilities/Reachability (7.4.3):
350359
- GoogleUtilities/Logger
351-
- GoogleUtilities/UserDefaults (7.4.1):
360+
- GoogleUtilities/UserDefaults (7.4.3):
352361
- GoogleUtilities/Logger
353362
- "gRPC-C++ (1.28.2)":
354363
- "gRPC-C++/Implementation (= 1.28.2)"
@@ -377,7 +386,7 @@ PODS:
377386
- GTMAppAuth (1.2.2):
378387
- AppAuth/Core (~> 1.4)
379388
- GTMSessionFetcher/Core (~> 1.5)
380-
- GTMSessionFetcher/Core (1.5.0)
389+
- GTMSessionFetcher/Core (1.6.1)
381390
- leveldb-library (1.22.1)
382391
- nanopb (2.30908.0):
383392
- nanopb/decode (= 2.30908.0)
@@ -408,6 +417,7 @@ SPEC REPOS:
408417
- AppAuth
409418
- BoringSSL-GRPC
410419
- FBSDKCoreKit
420+
- FBSDKCoreKit_Basics
411421
- FBSDKLoginKit
412422
- FirebaseAuth
413423
- FirebaseCore
@@ -455,32 +465,33 @@ SPEC CHECKSUMS:
455465
abseil: 6c8eb7892aefa08d929b39f9bb108e5367e3228f
456466
AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
457467
BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879
458-
FBSDKCoreKit: 0d1ae58388a458b8222f72025804cdc84eb5d0c3
459-
FBSDKLoginKit: aea68df6121c5e165ccae2fabfdc83c4644ee40f
468+
FBSDKCoreKit: 38c9e29a3f1436362acacff6486d3a28628c288f
469+
FBSDKCoreKit_Basics: 06780a4a12e16596bde8406add02c6aa1bf38616
470+
FBSDKLoginKit: 8243e04c590c38b85c69fcf09d1234514d2475c3
460471
FirebaseAnonymousAuthUI: 64de9383870378e8f16ef428d73e8c18e74ce5cc
461-
FirebaseAuth: b8cd992fca5b53dc6eec09e873a3f375f000c5a1
472+
FirebaseAuth: 4c4fb0ba1a169f3acb4aa5b724f7ae7c0999ee44
462473
FirebaseAuthUI: 3f6dcb6f9e1af8e889916e2e0f0f971a70c2d303
463-
FirebaseCore: 3f09591d51292843e2a46f18358d60bf4e996255
464-
FirebaseCoreDiagnostics: a31d987ba0fe16d59886a5dbadc2f1de871f88c8
465-
FirebaseDatabase: 363961e25451425be8b14bb8801a592515ec58f2
474+
FirebaseCore: 3a83f24c3de69ec9f9a426e2598125ea51f3a2ce
475+
FirebaseCoreDiagnostics: 61384f54989065b15c36b5922b65112e86811d3c
476+
FirebaseDatabase: 9c231733363229ac26a55ee9ae9031e94cdb9a7d
466477
FirebaseDatabaseUI: 4db2acaaee3c1a73e0daf31e926a8b7212941607
467-
FirebaseEmailAuthUI: ff51c964f327eb38ed1f3ac27057c090d4955b01
468-
FirebaseFacebookAuthUI: a8407d457cef6b1996de11c0ecde03b9a9dc1691
469-
FirebaseFirestore: 7f6576eaca9f821e864c3e917d68aa99f4e6b613
478+
FirebaseEmailAuthUI: 9d3ef1a6b89049079baaaea254f30c205176ceea
479+
FirebaseFacebookAuthUI: fa945e464b3ec751b5768f03f97f3479b99111c5
480+
FirebaseFirestore: 844182d64f052a8177d1766d14332e3af4726f3c
470481
FirebaseFirestoreUI: 24a7a35da1a570e8aabd592f60de9438f6959a4c
471-
FirebaseGoogleAuthUI: 95ac66fd249c6f6d47b53b6b578d3fe5a940db5c
482+
FirebaseGoogleAuthUI: d5dce74c7ae76b1fb18ece8a3be17c2fb6d47319
472483
FirebaseOAuthUI: 9f2f90a6cf72f1345473d205ff2071b994a071d8
473-
FirebasePhoneAuthUI: f494446c505cea2530b4d2dc44a7918be2836fb7
474-
FirebaseStorage: 61bcd27880fa17362f68be67d3683d04bfd7b1c7
484+
FirebasePhoneAuthUI: 12bb994905add3399eb0e48f64080d2b916309bb
485+
FirebaseStorage: 001a1f6b1ec45ed60ff9689390d23988e4b95a61
475486
FirebaseStorageUI: d66a62c897de1d0f279ec80c7ece6b8afc9c5913
476487
FirebaseUI: d2777b3abcb3fa40ea9eea9e40db5a154df608d3
477-
GoogleDataTransport: 11e3a5f2c190327df1a4a5d7e7ae3d4d5b9c9e4c
488+
GoogleDataTransport: 04c3e9a480bbcaa2ec3f5d27f1cdeb6a92f20c8d
478489
GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213
479-
GoogleUtilities: f8a43108b38a68eebe8b3540e1f4f2d28843ce20
490+
GoogleUtilities: 45dbb24a7f351d69d0a601482b39ad6c32e30dab
480491
"gRPC-C++": 13d8ccef97d5c3c441b7e3c529ef28ebee86fad2
481492
gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5
482493
GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89
483-
GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52
494+
GTMSessionFetcher: 36689134877faeb055b27dfa4ccc9ceaa42e029e
484495
leveldb-library: 50c7b45cbd7bf543c81a468fe557a16ae3db8729
485496
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
486497
PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97

0 commit comments

Comments
 (0)