Skip to content

Commit 5382f75

Browse files
morganchen12morganchen12
authored
Merge pull request #887 from firebase/morganchen/9
Prepare for major version bump
2 parents 3a36b91 + ddceebe commit 5382f75

File tree

26 files changed

+287
-257
lines changed

26 files changed

+287
-257
lines changed

‎AnonymousAuth/FirebaseAnonymousAuthUI.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 51;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -453,8 +453,11 @@
453453
"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"",
454454
"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"",
455455
"\"${PODS_CONFIGURATION_BUILD_DIR}/OCMock\"",
456+
"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
457+
"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
456458
);
457459
OTHER_LDFLAGS = (
460+
"$(inherited)",
458461
"-ObjC",
459462
"-framework",
460463
"\"GTMSessionFetcher\"",
@@ -484,8 +487,11 @@
484487
"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"",
485488
"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"",
486489
"\"${PODS_CONFIGURATION_BUILD_DIR}/OCMock\"",
490+
"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
491+
"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
487492
);
488493
OTHER_LDFLAGS = (
494+
"$(inherited)",
489495
"-ObjC",
490496
"-framework",
491497
"\"GTMSessionFetcher\"",

‎AnonymousAuth/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :ios, '8.0'
1+
platform :ios, '9.0'
22

33
target 'FirebaseAnonymousAuthUI' do
44
use_frameworks!

‎AnonymousAuth/Podfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ PODS:
1818
- GoogleUtilities/Environment (~> 6.5)
1919
- GoogleUtilities/Logger (~> 6.5)
2020
- nanopb (~> 1.30905.0)
21-
- FirebaseUI/Auth (8.4.2):
22-
- Firebase/Auth (~> 6.0)
21+
- FirebaseUI/Auth (9.0.0):
22+
- Firebase/Auth
2323
- GoogleUtilities/UserDefaults
2424
- GoogleDataTransport (6.2.1)
2525
- GoogleDataTransportCCTSupport (3.2.0):
@@ -79,7 +79,7 @@ SPEC CHECKSUMS:
7979
FirebaseAuth: b85c064e0ac60f82486728d50a4803f235687302
8080
FirebaseCore: 8cd4f8ea22075e0ee582849b1cf79d8816506085
8181
FirebaseCoreDiagnostics: 4505e4d4009b1d93f605088ee7d7764d5f0d1c84
82-
FirebaseUI: 65c06dd1576bdd2e39972533ba12ad21036c3543
82+
FirebaseUI: ad6328371d2bb285ab5be9574ba189148f4f7deb
8383
GoogleDataTransport: 9a8a16f79feffc7f42096743de2a7c4815e84020
8484
GoogleDataTransportCCTSupport: 489c1265d2c85b68187a83a911913d190012158d
8585
GoogleUtilities: 39530bc0ad980530298e9c4af8549e991fd033b1
@@ -88,6 +88,6 @@ SPEC CHECKSUMS:
8888
OCMock: 5ea90566be239f179ba766fd9fbae5885040b992
8989
PromisesObjC: b48e0338dbbac2207e611750777895f7a5811b75
9090

91-
PODFILE CHECKSUM: dd5f618b7b3efad7d3eb9d842878ab03d443c8d4
91+
PODFILE CHECKSUM: e679f15af71e712ea96ab9e68365925a810caaf8
9292

9393
COCOAPODS: 1.9.3

‎Auth/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# source 'sso://cpdc-internal/firebase'
22
source 'https://github.com/CocoaPods/Specs.git'
33

4-
platform :ios, '8.0'
4+
platform :ios, '9.0'
55

66
target 'FirebaseAuthUI' do
77
use_frameworks!

‎Database/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# source 'sso://cpdc-internal/firebase'
22
source 'https://github.com/CocoaPods/Specs.git'
33

4-
platform :ios, '8.0'
4+
platform :ios, '9.0'
55

66
target 'FirebaseDatabaseUI' do
77
use_frameworks!

‎EmailAuth/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# source 'sso://cpdc-internal/firebase'
22
source 'https://github.com/CocoaPods/Specs.git'
33

4-
platform :ios, '8.0'
4+
platform :ios, '9.0'
55

66
target 'FirebaseEmailAuthUI' do
77
use_frameworks!

‎FacebookAuth/FirebaseFacebookAuthUI.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,7 @@
676676
"@loader_path/Frameworks",
677677
);
678678
OTHER_LDFLAGS = (
679+
"$(inherited)",
679680
"-ObjC",
680681
"-framework",
681682
"\"FBSDKCoreKit\"",
@@ -718,6 +719,7 @@
718719
"@loader_path/Frameworks",
719720
);
720721
OTHER_LDFLAGS = (
722+
"$(inherited)",
721723
"-ObjC",
722724
"-framework",
723725
"\"FBSDKCoreKit\"",
@@ -759,8 +761,11 @@
759761
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"",
760762
"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"",
761763
"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"",
764+
"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
765+
"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
762766
);
763767
OTHER_LDFLAGS = (
768+
"$(inherited)",
764769
"-ObjC",
765770
"-framework",
766771
"\"FBSDKCoreKit\"",
@@ -803,8 +808,11 @@
803808
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"",
804809
"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"",
805810
"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"",
811+
"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
812+
"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
806813
);
807814
OTHER_LDFLAGS = (
815+
"$(inherited)",
808816
"-ObjC",
809817
"-framework",
810818
"\"FBSDKCoreKit\"",

‎FacebookAuth/FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ - (void)setUp {
4848
OCMStub(ClassMethod([authClass auth])).
4949
andReturn(authClass);
5050

51-
id bundle = [NSBundle bundleForClass:[self class]];
52-
id mockNSBundleClass = OCMClassMock([NSBundle class]);
53-
OCMStub(ClassMethod(mockNSBundleClass)).andReturn(bundle);
54-
5551
self.provider = [[FUIFacebookAuthTest alloc] init];
5652
}
5753

‎FacebookAuth/Podfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# source 'sso://cpdc-internal/firebase'
22
source 'https://github.com/CocoaPods/Specs.git'
33

4-
platform :ios, '8.0'
4+
platform :ios, '9.0'
55

66
target 'FirebaseFacebookAuthUI' do
77
use_frameworks!
88

99
# The facebook pods generate an unreasonable number of warnings.
1010
inhibit_all_warnings!
1111

12-
pod 'FBSDKLoginKit', '~> 5.0'
13-
pod 'FBSDKCoreKit', '~> 5.0'
12+
pod 'FBSDKLoginKit', '~> 7.0'
13+
pod 'FBSDKCoreKit'
1414

1515
pod 'FirebaseUI/Auth', :path => '../'
1616

‎FacebookAuth/Podfile.lock‎

Lines changed: 47 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,70 @@
11
PODS:
2-
- FBSDKCoreKit (5.15.1):
3-
- FBSDKCoreKit/Basics (= 5.15.1)
4-
- FBSDKCoreKit/Core (= 5.15.1)
5-
- FBSDKCoreKit/Basics (5.15.1)
6-
- FBSDKCoreKit/Core (5.15.1):
2+
- FBSDKCoreKit (7.1.1):
3+
- FBSDKCoreKit/Basics (= 7.1.1)
4+
- FBSDKCoreKit/Core (= 7.1.1)
5+
- FBSDKCoreKit/Basics (7.1.1)
6+
- FBSDKCoreKit/Core (7.1.1):
77
- FBSDKCoreKit/Basics
8-
- FBSDKLoginKit (5.15.1):
9-
- FBSDKLoginKit/Login (= 5.15.1)
10-
- FBSDKLoginKit/Login (5.15.1):
11-
- FBSDKCoreKit (~> 5.0)
12-
- Firebase/Auth (6.27.1):
8+
- FBSDKLoginKit (7.1.1):
9+
- FBSDKLoginKit/Login (= 7.1.1)
10+
- FBSDKLoginKit/Login (7.1.1):
11+
- FBSDKCoreKit (~> 7.1.1)
12+
- Firebase/Auth (6.29.0):
1313
- Firebase/CoreOnly
14-
- FirebaseAuth (~> 6.6.0)
15-
- Firebase/CoreOnly (6.27.1):
16-
- FirebaseCore (= 6.8.1)
17-
- FirebaseAuth (6.6.0):
14+
- FirebaseAuth (~> 6.7.1)
15+
- Firebase/CoreOnly (6.29.0):
16+
- FirebaseCore (= 6.9.2)
17+
- FirebaseAuth (6.7.1):
1818
- FirebaseCore (~> 6.8)
19-
- GoogleUtilities/AppDelegateSwizzler (~> 6.5)
20-
- GoogleUtilities/Environment (~> 6.5)
19+
- GoogleUtilities/AppDelegateSwizzler (~> 6.7)
20+
- GoogleUtilities/Environment (~> 6.7)
2121
- GTMSessionFetcher/Core (~> 1.1)
22-
- FirebaseCore (6.8.1):
22+
- FirebaseCore (6.9.2):
2323
- FirebaseCoreDiagnostics (~> 1.3)
24-
- GoogleUtilities/Environment (~> 6.5)
25-
- GoogleUtilities/Logger (~> 6.5)
26-
- FirebaseCoreDiagnostics (1.4.0):
27-
- GoogleDataTransportCCTSupport (~> 3.1)
28-
- GoogleUtilities/Environment (~> 6.5)
29-
- GoogleUtilities/Logger (~> 6.5)
24+
- GoogleUtilities/Environment (~> 6.7)
25+
- GoogleUtilities/Logger (~> 6.7)
26+
- FirebaseCoreDiagnostics (1.5.0):
27+
- GoogleDataTransport (~> 7.0)
28+
- GoogleUtilities/Environment (~> 6.7)
29+
- GoogleUtilities/Logger (~> 6.7)
3030
- nanopb (~> 1.30905.0)
31-
- FirebaseUI/Auth (8.4.2):
31+
- FirebaseUI/Auth (9.0.0):
3232
- Firebase/Auth (~> 6.0)
3333
- GoogleUtilities/UserDefaults
34-
- GoogleDataTransport (6.2.1)
35-
- GoogleDataTransportCCTSupport (3.2.0):
36-
- GoogleDataTransport (~> 6.1)
34+
- GoogleDataTransport (7.1.0):
3735
- nanopb (~> 1.30905.0)
38-
- GoogleUtilities/AppDelegateSwizzler (6.6.0):
36+
- GoogleUtilities/AppDelegateSwizzler (6.7.1):
3937
- GoogleUtilities/Environment
4038
- GoogleUtilities/Logger
4139
- GoogleUtilities/Network
42-
- GoogleUtilities/Environment (6.6.0):
40+
- GoogleUtilities/Environment (6.7.1):
4341
- PromisesObjC (~> 1.2)
44-
- GoogleUtilities/Logger (6.6.0):
42+
- GoogleUtilities/Logger (6.7.1):
4543
- GoogleUtilities/Environment
46-
- GoogleUtilities/Network (6.6.0):
44+
- GoogleUtilities/Network (6.7.1):
4745
- GoogleUtilities/Logger
4846
- "GoogleUtilities/NSData+zlib"
4947
- GoogleUtilities/Reachability
50-
- "GoogleUtilities/NSData+zlib (6.6.0)"
51-
- GoogleUtilities/Reachability (6.6.0):
48+
- "GoogleUtilities/NSData+zlib (6.7.1)"
49+
- GoogleUtilities/Reachability (6.7.1):
5250
- GoogleUtilities/Logger
53-
- GoogleUtilities/UserDefaults (6.6.0):
51+
- GoogleUtilities/UserDefaults (6.7.1):
5452
- GoogleUtilities/Logger
5553
- GTMSessionFetcher/Core (1.4.0)
5654
- nanopb (1.30905.0):
5755
- nanopb/decode (= 1.30905.0)
5856
- nanopb/encode (= 1.30905.0)
5957
- nanopb/decode (1.30905.0)
6058
- nanopb/encode (1.30905.0)
61-
- OCMock (3.6)
59+
- OCMock (3.7.1)
6260
- PromisesObjC (1.2.9)
6361

6462
DEPENDENCIES:
65-
- FBSDKCoreKit (~> 5.0)
66-
- FBSDKLoginKit (~> 5.0)
63+
- FBSDKCoreKit
64+
- FBSDKLoginKit (~> 7.0)
6765
- FirebaseUI/Auth (from `../`)
6866
- OCMock
67+
- PromisesObjC
6968

7069
SPEC REPOS:
7170
https://github.com/CocoaPods/Specs.git:
@@ -76,7 +75,6 @@ SPEC REPOS:
7675
- FirebaseCore
7776
- FirebaseCoreDiagnostics
7877
- GoogleDataTransport
79-
- GoogleDataTransportCCTSupport
8078
- GoogleUtilities
8179
- GTMSessionFetcher
8280
- nanopb
@@ -88,21 +86,20 @@ EXTERNAL SOURCES:
8886
:path: "../"
8987

9088
SPEC CHECKSUMS:
91-
FBSDKCoreKit: 1d5acf7c9d7a2f92bb1a242dc60cae5b7adb91df
92-
FBSDKLoginKit: f1ea8026a58b52d30c9f2e6a58ca7d813619fb83
93-
Firebase: 919186c8e119dd9372a45fd1dd17a8a942bc1892
94-
FirebaseAuth: b85c064e0ac60f82486728d50a4803f235687302
95-
FirebaseCore: 8cd4f8ea22075e0ee582849b1cf79d8816506085
96-
FirebaseCoreDiagnostics: 4505e4d4009b1d93f605088ee7d7764d5f0d1c84
97-
FirebaseUI: 65c06dd1576bdd2e39972533ba12ad21036c3543
98-
GoogleDataTransport: 9a8a16f79feffc7f42096743de2a7c4815e84020
99-
GoogleDataTransportCCTSupport: 489c1265d2c85b68187a83a911913d190012158d
100-
GoogleUtilities: 39530bc0ad980530298e9c4af8549e991fd033b1
89+
FBSDKCoreKit: b46507dc8b8cefed31d644e74d7cc30e2a715ef8
90+
FBSDKLoginKit: 1a61d79e2b25e2fc0d03dccab1e34b38bbdf2546
91+
Firebase: 57957c8d6eb3d8b80a560b1dc58be24724b89ff2
92+
FirebaseAuth: a818d73466d51db897d3bf3c0f3baa3dae7fd4c0
93+
FirebaseCore: 7930a1946517d94256d857f97371ed993b55f7bd
94+
FirebaseCoreDiagnostics: 7535fe695737f8c5b350584292a70b7f8ff0357b
95+
FirebaseUI: bf782546893b1e5eb26f41f77840b676c2344d4b
96+
GoogleDataTransport: af0c79193dc59acd37630b4833d0dc6912ae6bd5
97+
GoogleUtilities: e121a3867449ce16b0e35ddf1797ea7a389ffdf2
10198
GTMSessionFetcher: 6f5c8abbab8a9bce4bb3f057e317728ec6182b10
10299
nanopb: c43f40fadfe79e8b8db116583945847910cbabc9
103-
OCMock: 5ea90566be239f179ba766fd9fbae5885040b992
100+
OCMock: 75fbeaa46a9b11f8c182bbb1d1f7e9a35ccc9955
104101
PromisesObjC: b48e0338dbbac2207e611750777895f7a5811b75
105102

106-
PODFILE CHECKSUM: d4087ca55e7289fffba35c7dae37752581dfdfe2
103+
PODFILE CHECKSUM: 1f542591236e32bf7ebedf323c4932e7a6109c16
107104

108105
COCOAPODS: 1.9.3

0 commit comments

Comments
 (0)