Skip to content

Commit 774d064

Browse files
morganchen12morganchen12
committed
Merge branch 'master' of github.com:firebase/FirebaseUI-iOS
2 parents 4201323 + aa557dc commit 774d064

File tree

10 files changed

+155
-153
lines changed

10 files changed

+155
-153
lines changed

‎FirebaseAnonymousAuthUI/Podfile.lock‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@ PODS:
2525
- GoogleUtilities/Environment (~> 7.2)
2626
- nanopb (~> 2.30908.0)
2727
- PromisesObjC (~> 1.2)
28-
- GoogleUtilities/AppDelegateSwizzler (7.3.1):
28+
- GoogleUtilities/AppDelegateSwizzler (7.4.0):
2929
- GoogleUtilities/Environment
3030
- GoogleUtilities/Logger
3131
- GoogleUtilities/Network
32-
- GoogleUtilities/Environment (7.3.1):
32+
- GoogleUtilities/Environment (7.4.0):
3333
- PromisesObjC (~> 1.2)
34-
- GoogleUtilities/Logger (7.3.1):
34+
- GoogleUtilities/Logger (7.4.0):
3535
- GoogleUtilities/Environment
36-
- GoogleUtilities/Network (7.3.1):
36+
- GoogleUtilities/Network (7.4.0):
3737
- GoogleUtilities/Logger
3838
- "GoogleUtilities/NSData+zlib"
3939
- GoogleUtilities/Reachability
40-
- "GoogleUtilities/NSData+zlib (7.3.1)"
41-
- GoogleUtilities/Reachability (7.3.1):
40+
- "GoogleUtilities/NSData+zlib (7.4.0)"
41+
- GoogleUtilities/Reachability (7.4.0):
4242
- GoogleUtilities/Logger
43-
- GoogleUtilities/UserDefaults (7.3.1):
43+
- GoogleUtilities/UserDefaults (7.4.0):
4444
- GoogleUtilities/Logger
4545
- GTMSessionFetcher/Core (1.5.0)
4646
- nanopb (2.30908.0):
@@ -79,7 +79,7 @@ SPEC CHECKSUMS:
7979
FirebaseCore: 907447d8917a4d3eb0cce2829c5a0ad21d90b432
8080
FirebaseCoreDiagnostics: 68ad972f99206cef818230f3f3179d52ccfb7f8c
8181
GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7
82-
GoogleUtilities: e1d9ed4e544fc32a93e00e721400cbc3f377200d
82+
GoogleUtilities: 284cddc7fffc14ae1907efb6f78ab95c1fccaedc
8383
GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52
8484
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
8585
OCMock: 29f6e52085b4e7d9b075cbf03ed7c3112f82f934

‎FirebaseAuthUI/Podfile.lock‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,48 @@
11
PODS:
2-
- Firebase/Auth (7.4.0):
2+
- Firebase/Auth (7.11.0):
33
- Firebase/CoreOnly
4-
- FirebaseAuth (~> 7.4.0)
5-
- Firebase/CoreOnly (7.4.0):
6-
- FirebaseCore (= 7.4.0)
7-
- FirebaseAuth (7.4.0):
4+
- FirebaseAuth (~> 7.11.0)
5+
- Firebase/CoreOnly (7.11.0):
6+
- FirebaseCore (= 7.11.0)
7+
- FirebaseAuth (7.11.0):
88
- FirebaseCore (~> 7.0)
99
- GoogleUtilities/AppDelegateSwizzler (~> 7.0)
1010
- GoogleUtilities/Environment (~> 7.0)
1111
- GTMSessionFetcher/Core (~> 1.4)
12-
- FirebaseCore (7.4.0):
12+
- FirebaseCore (7.11.0):
1313
- FirebaseCoreDiagnostics (~> 7.4)
1414
- GoogleUtilities/Environment (~> 7.0)
1515
- GoogleUtilities/Logger (~> 7.0)
16-
- FirebaseCoreDiagnostics (7.4.0):
17-
- GoogleDataTransport (~> 8.0)
16+
- FirebaseCoreDiagnostics (7.11.0):
17+
- GoogleDataTransport (~> 8.4)
1818
- GoogleUtilities/Environment (~> 7.0)
1919
- GoogleUtilities/Logger (~> 7.0)
20-
- nanopb (~> 2.30907.0)
21-
- GoogleDataTransport (8.2.0):
22-
- nanopb (~> 2.30907.0)
23-
- GoogleUtilities/AppDelegateSwizzler (7.2.0):
20+
- nanopb (~> 2.30908.0)
21+
- GoogleDataTransport (8.4.0):
22+
- GoogleUtilities/Environment (~> 7.2)
23+
- nanopb (~> 2.30908.0)
24+
- PromisesObjC (~> 1.2)
25+
- GoogleUtilities/AppDelegateSwizzler (7.4.0):
2426
- GoogleUtilities/Environment
2527
- GoogleUtilities/Logger
2628
- GoogleUtilities/Network
27-
- GoogleUtilities/Environment (7.2.0):
29+
- GoogleUtilities/Environment (7.4.0):
2830
- PromisesObjC (~> 1.2)
29-
- GoogleUtilities/Logger (7.2.0):
31+
- GoogleUtilities/Logger (7.4.0):
3032
- GoogleUtilities/Environment
31-
- GoogleUtilities/Network (7.2.0):
33+
- GoogleUtilities/Network (7.4.0):
3234
- GoogleUtilities/Logger
3335
- "GoogleUtilities/NSData+zlib"
3436
- GoogleUtilities/Reachability
35-
- "GoogleUtilities/NSData+zlib (7.2.0)"
36-
- GoogleUtilities/Reachability (7.2.0):
37+
- "GoogleUtilities/NSData+zlib (7.4.0)"
38+
- GoogleUtilities/Reachability (7.4.0):
3739
- GoogleUtilities/Logger
3840
- GTMSessionFetcher/Core (1.5.0)
39-
- nanopb (2.30907.0):
40-
- nanopb/decode (= 2.30907.0)
41-
- nanopb/encode (= 2.30907.0)
42-
- nanopb/decode (2.30907.0)
43-
- nanopb/encode (2.30907.0)
41+
- nanopb (2.30908.0):
42+
- nanopb/decode (= 2.30908.0)
43+
- nanopb/encode (= 2.30908.0)
44+
- nanopb/decode (2.30908.0)
45+
- nanopb/encode (2.30908.0)
4446
- OCMock (3.8.1)
4547
- PromisesObjC (1.2.12)
4648

@@ -62,14 +64,14 @@ SPEC REPOS:
6264
- PromisesObjC
6365

6466
SPEC CHECKSUMS:
65-
Firebase: 09fb40287b6dfc8ee65f726fa0b788719d3f2a07
66-
FirebaseAuth: d8dba8db90a1705ee2493857047282ca4f6e7598
67-
FirebaseCore: 99c06e5a1e8d6952e75cb1f0a6d0b23c0f5ccdcf
68-
FirebaseCoreDiagnostics: 3770093ac4f2be4590fa03cfa1d3a6e5602d4557
69-
GoogleDataTransport: 1024b1a4dfbd7a0e92cb20d7e0a6f1fb66b449a4
70-
GoogleUtilities: d866834472f1324d080496bc67ab3ce5d0d46027
67+
Firebase: c121feb35e4126c0b355e3313fa9b487d47319fd
68+
FirebaseAuth: 5fe4585c2ed847319f0ea68bd1d82c77e49ff9a0
69+
FirebaseCore: 907447d8917a4d3eb0cce2829c5a0ad21d90b432
70+
FirebaseCoreDiagnostics: 68ad972f99206cef818230f3f3179d52ccfb7f8c
71+
GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7
72+
GoogleUtilities: 284cddc7fffc14ae1907efb6f78ab95c1fccaedc
7173
GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52
72-
nanopb: 59221d7f958fb711001e6a449489542d92ae113e
74+
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
7375
OCMock: 29f6e52085b4e7d9b075cbf03ed7c3112f82f934
7476
PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
7577

‎FirebaseDatabaseUI/Podfile.lock‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
11
PODS:
2-
- Firebase/CoreOnly (7.4.0):
3-
- FirebaseCore (= 7.4.0)
4-
- Firebase/Database (7.4.0):
2+
- Firebase/CoreOnly (7.11.0):
3+
- FirebaseCore (= 7.11.0)
4+
- Firebase/Database (7.11.0):
55
- Firebase/CoreOnly
6-
- FirebaseDatabase (~> 7.4.0)
7-
- FirebaseCore (7.4.0):
6+
- FirebaseDatabase (~> 7.11.0)
7+
- FirebaseCore (7.11.0):
88
- FirebaseCoreDiagnostics (~> 7.4)
99
- GoogleUtilities/Environment (~> 7.0)
1010
- GoogleUtilities/Logger (~> 7.0)
11-
- FirebaseCoreDiagnostics (7.4.0):
12-
- GoogleDataTransport (~> 8.0)
11+
- FirebaseCoreDiagnostics (7.11.0):
12+
- GoogleDataTransport (~> 8.4)
1313
- GoogleUtilities/Environment (~> 7.0)
1414
- GoogleUtilities/Logger (~> 7.0)
15-
- nanopb (~> 2.30907.0)
16-
- FirebaseDatabase (7.4.0):
15+
- nanopb (~> 2.30908.0)
16+
- FirebaseDatabase (7.11.0):
1717
- FirebaseCore (~> 7.0)
1818
- leveldb-library (~> 1.22)
19-
- GoogleDataTransport (8.2.0):
20-
- nanopb (~> 2.30907.0)
21-
- GoogleUtilities/Environment (7.2.0):
19+
- GoogleDataTransport (8.4.0):
20+
- GoogleUtilities/Environment (~> 7.2)
21+
- nanopb (~> 2.30908.0)
2222
- PromisesObjC (~> 1.2)
23-
- GoogleUtilities/Logger (7.2.0):
23+
- GoogleUtilities/Environment (7.4.0):
24+
- PromisesObjC (~> 1.2)
25+
- GoogleUtilities/Logger (7.4.0):
2426
- GoogleUtilities/Environment
25-
- leveldb-library (1.22)
26-
- nanopb (2.30907.0):
27-
- nanopb/decode (= 2.30907.0)
28-
- nanopb/encode (= 2.30907.0)
29-
- nanopb/decode (2.30907.0)
30-
- nanopb/encode (2.30907.0)
27+
- leveldb-library (1.22.1)
28+
- nanopb (2.30908.0):
29+
- nanopb/decode (= 2.30908.0)
30+
- nanopb/encode (= 2.30908.0)
31+
- nanopb/decode (2.30908.0)
32+
- nanopb/encode (2.30908.0)
3133
- PromisesObjC (1.2.12)
3234

3335
DEPENDENCIES:
@@ -46,14 +48,14 @@ SPEC REPOS:
4648
- PromisesObjC
4749

4850
SPEC CHECKSUMS:
49-
Firebase: 09fb40287b6dfc8ee65f726fa0b788719d3f2a07
50-
FirebaseCore: 99c06e5a1e8d6952e75cb1f0a6d0b23c0f5ccdcf
51-
FirebaseCoreDiagnostics: 3770093ac4f2be4590fa03cfa1d3a6e5602d4557
52-
FirebaseDatabase: 0a619c887a9565bf4808eba37d2f0ed1d62f62d0
53-
GoogleDataTransport: 1024b1a4dfbd7a0e92cb20d7e0a6f1fb66b449a4
54-
GoogleUtilities: d866834472f1324d080496bc67ab3ce5d0d46027
55-
leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7
56-
nanopb: 59221d7f958fb711001e6a449489542d92ae113e
51+
Firebase: c121feb35e4126c0b355e3313fa9b487d47319fd
52+
FirebaseCore: 907447d8917a4d3eb0cce2829c5a0ad21d90b432
53+
FirebaseCoreDiagnostics: 68ad972f99206cef818230f3f3179d52ccfb7f8c
54+
FirebaseDatabase: 6c39fbf1c8514a2f32e610f9bf9ef30c535dc15a
55+
GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7
56+
GoogleUtilities: 284cddc7fffc14ae1907efb6f78ab95c1fccaedc
57+
leveldb-library: 50c7b45cbd7bf543c81a468fe557a16ae3db8729
58+
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
5759
PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
5860

5961
PODFILE CHECKSUM: 431a95428db2b29fae32eabd64aa31f6dfd32540

‎FirebaseEmailAuthUI/Podfile.lock‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@ PODS:
2525
- GoogleUtilities/Environment (~> 7.2)
2626
- nanopb (~> 2.30908.0)
2727
- PromisesObjC (~> 1.2)
28-
- GoogleUtilities/AppDelegateSwizzler (7.3.1):
28+
- GoogleUtilities/AppDelegateSwizzler (7.4.0):
2929
- GoogleUtilities/Environment
3030
- GoogleUtilities/Logger
3131
- GoogleUtilities/Network
32-
- GoogleUtilities/Environment (7.3.1):
32+
- GoogleUtilities/Environment (7.4.0):
3333
- PromisesObjC (~> 1.2)
34-
- GoogleUtilities/Logger (7.3.1):
34+
- GoogleUtilities/Logger (7.4.0):
3535
- GoogleUtilities/Environment
36-
- GoogleUtilities/Network (7.3.1):
36+
- GoogleUtilities/Network (7.4.0):
3737
- GoogleUtilities/Logger
3838
- "GoogleUtilities/NSData+zlib"
3939
- GoogleUtilities/Reachability
40-
- "GoogleUtilities/NSData+zlib (7.3.1)"
41-
- GoogleUtilities/Reachability (7.3.1):
40+
- "GoogleUtilities/NSData+zlib (7.4.0)"
41+
- GoogleUtilities/Reachability (7.4.0):
4242
- GoogleUtilities/Logger
43-
- GoogleUtilities/UserDefaults (7.3.1):
43+
- GoogleUtilities/UserDefaults (7.4.0):
4444
- GoogleUtilities/Logger
4545
- GTMSessionFetcher/Core (1.5.0)
4646
- nanopb (2.30908.0):
@@ -79,7 +79,7 @@ SPEC CHECKSUMS:
7979
FirebaseCore: 907447d8917a4d3eb0cce2829c5a0ad21d90b432
8080
FirebaseCoreDiagnostics: 68ad972f99206cef818230f3f3179d52ccfb7f8c
8181
GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7
82-
GoogleUtilities: e1d9ed4e544fc32a93e00e721400cbc3f377200d
82+
GoogleUtilities: 284cddc7fffc14ae1907efb6f78ab95c1fccaedc
8383
GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52
8484
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
8585
OCMock: 29f6e52085b4e7d9b075cbf03ed7c3112f82f934

‎FirebaseFacebookAuthUI/Podfile.lock‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
PODS:
2-
- FBSDKCoreKit (9.0.0):
3-
- FBSDKCoreKit/Basics (= 9.0.0)
4-
- FBSDKCoreKit/Core (= 9.0.0)
5-
- FBSDKCoreKit/Basics (9.0.0)
6-
- FBSDKCoreKit/Core (9.0.0):
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):
77
- FBSDKCoreKit/Basics
8-
- FBSDKLoginKit (9.0.0):
9-
- FBSDKLoginKit/Login (= 9.0.0)
10-
- FBSDKLoginKit/Login (9.0.0):
11-
- FBSDKCoreKit (~> 9.0.0)
8+
- FBSDKLoginKit (9.3.0):
9+
- FBSDKLoginKit/Login (= 9.3.0)
10+
- FBSDKLoginKit/Login (9.3.0):
11+
- FBSDKCoreKit (~> 9.3.0)
1212
- Firebase/Auth (7.11.0):
1313
- Firebase/CoreOnly
1414
- FirebaseAuth (~> 7.11.0)
@@ -35,22 +35,22 @@ PODS:
3535
- GoogleUtilities/Environment (~> 7.2)
3636
- nanopb (~> 2.30908.0)
3737
- PromisesObjC (~> 1.2)
38-
- GoogleUtilities/AppDelegateSwizzler (7.3.1):
38+
- GoogleUtilities/AppDelegateSwizzler (7.4.0):
3939
- GoogleUtilities/Environment
4040
- GoogleUtilities/Logger
4141
- GoogleUtilities/Network
42-
- GoogleUtilities/Environment (7.3.1):
42+
- GoogleUtilities/Environment (7.4.0):
4343
- PromisesObjC (~> 1.2)
44-
- GoogleUtilities/Logger (7.3.1):
44+
- GoogleUtilities/Logger (7.4.0):
4545
- GoogleUtilities/Environment
46-
- GoogleUtilities/Network (7.3.1):
46+
- GoogleUtilities/Network (7.4.0):
4747
- GoogleUtilities/Logger
4848
- "GoogleUtilities/NSData+zlib"
4949
- GoogleUtilities/Reachability
50-
- "GoogleUtilities/NSData+zlib (7.3.1)"
51-
- GoogleUtilities/Reachability (7.3.1):
50+
- "GoogleUtilities/NSData+zlib (7.4.0)"
51+
- GoogleUtilities/Reachability (7.4.0):
5252
- GoogleUtilities/Logger
53-
- GoogleUtilities/UserDefaults (7.3.1):
53+
- GoogleUtilities/UserDefaults (7.4.0):
5454
- GoogleUtilities/Logger
5555
- GTMSessionFetcher/Core (1.5.0)
5656
- nanopb (2.30908.0):
@@ -87,15 +87,15 @@ EXTERNAL SOURCES:
8787
:path: "../"
8888

8989
SPEC CHECKSUMS:
90-
FBSDKCoreKit: ac6cc500b8e104bb9a4dd20b1527b5d199123c2e
91-
FBSDKLoginKit: e9b6542fdee322333502ab497f628b011dce7d78
90+
FBSDKCoreKit: 0d1ae58388a458b8222f72025804cdc84eb5d0c3
91+
FBSDKLoginKit: aea68df6121c5e165ccae2fabfdc83c4644ee40f
9292
Firebase: c121feb35e4126c0b355e3313fa9b487d47319fd
9393
FirebaseAuth: 5fe4585c2ed847319f0ea68bd1d82c77e49ff9a0
9494
FirebaseAuthUI: b3511544eeec97b719aeda7ccd779f7f0ff086d3
9595
FirebaseCore: 907447d8917a4d3eb0cce2829c5a0ad21d90b432
9696
FirebaseCoreDiagnostics: 68ad972f99206cef818230f3f3179d52ccfb7f8c
9797
GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7
98-
GoogleUtilities: e1d9ed4e544fc32a93e00e721400cbc3f377200d
98+
GoogleUtilities: 284cddc7fffc14ae1907efb6f78ab95c1fccaedc
9999
GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52
100100
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
101101
OCMock: 29f6e52085b4e7d9b075cbf03ed7c3112f82f934

‎FirebaseGoogleAuthUI/Podfile.lock‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,31 +34,27 @@ PODS:
3434
- AppAuth (~> 1.2)
3535
- GTMAppAuth (~> 1.0)
3636
- GTMSessionFetcher/Core (~> 1.1)
37-
- GoogleUtilities/AppDelegateSwizzler (7.3.1):
37+
- GoogleUtilities/AppDelegateSwizzler (7.4.0):
3838
- GoogleUtilities/Environment
3939
- GoogleUtilities/Logger
4040
- GoogleUtilities/Network
41-
- GoogleUtilities/Environment (7.3.1):
41+
- GoogleUtilities/Environment (7.4.0):
4242
- PromisesObjC (~> 1.2)
43-
- GoogleUtilities/Logger (7.3.1):
43+
- GoogleUtilities/Logger (7.4.0):
4444
- GoogleUtilities/Environment
45-
- GoogleUtilities/Network (7.3.1):
45+
- GoogleUtilities/Network (7.4.0):
4646
- GoogleUtilities/Logger
4747
- "GoogleUtilities/NSData+zlib"
4848
- GoogleUtilities/Reachability
49-
- "GoogleUtilities/NSData+zlib (7.3.1)"
50-
- GoogleUtilities/Reachability (7.3.1):
49+
- "GoogleUtilities/NSData+zlib (7.4.0)"
50+
- GoogleUtilities/Reachability (7.4.0):
5151
- GoogleUtilities/Logger
52-
- GoogleUtilities/UserDefaults (7.3.1):
52+
- GoogleUtilities/UserDefaults (7.4.0):
5353
- GoogleUtilities/Logger
54-
- GTMAppAuth (1.1.0):
54+
- GTMAppAuth (1.2.1):
5555
- AppAuth/Core (~> 1.4)
56-
- GTMSessionFetcher (~> 1.4)
57-
- GTMSessionFetcher (1.5.0):
58-
- GTMSessionFetcher/Full (= 1.5.0)
56+
- GTMSessionFetcher/Core (~> 1.5)
5957
- GTMSessionFetcher/Core (1.5.0)
60-
- GTMSessionFetcher/Full (1.5.0):
61-
- GTMSessionFetcher/Core (= 1.5.0)
6258
- nanopb (2.30908.0):
6359
- nanopb/decode (= 2.30908.0)
6460
- nanopb/encode (= 2.30908.0)
@@ -101,8 +97,8 @@ SPEC CHECKSUMS:
10197
FirebaseCoreDiagnostics: 68ad972f99206cef818230f3f3179d52ccfb7f8c
10298
GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7
10399
GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213
104-
GoogleUtilities: e1d9ed4e544fc32a93e00e721400cbc3f377200d
105-
GTMAppAuth: 197a8dabfea5d665224aa00d17f164fc2248dab9
100+
GoogleUtilities: 284cddc7fffc14ae1907efb6f78ab95c1fccaedc
101+
GTMAppAuth: 5b53231ef6920f149ab84b2969cb0ab572da3077
106102
GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52
107103
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
108104
OCMock: 29f6e52085b4e7d9b075cbf03ed7c3112f82f934

0 commit comments

Comments
 (0)