Skip to content

Commit 6d8cb93

Browse files
schmidt-sebastianschmidt-sebastian
committed
Merge branch 'master' into held_acks_master
2 parents 6b62a5b + b869115 commit 6d8cb93

File tree

66 files changed

+1021
-661
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1021
-661
lines changed

‎Carthage.md

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.js
3939
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDynamicLinksBinary.json"
4040
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json"
4141
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json"
42+
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInAppMessagingBinary.json"
43+
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInAppMessagingDisplayBinary.json"
4244
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInvitesBinary.json"
4345
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMessagingBinary.json"
4446
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMLModelInterpreterBinary.json"

‎Example/Auth/Tests/FIRAuthDispatcherTests.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
/** @var kExpectationTimeout
3333
@brief The maximum time waiting for expectations to fulfill.
3434
*/
35-
static const NSTimeInterval kExpectationTimeout = 2;
35+
static const NSTimeInterval kExpectationTimeout = 3;
3636

3737
id<OS_dispatch_queue> testWorkQueue;
3838

‎Example/Core/Tests/FIRAppTest.m

+148-148
Large diffs are not rendered by default.

‎Example/Core/Tests/FIROptionsTest.m

+19
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,25 @@ - (void)testAnalyticsCollectionExplicitlySet {
556556
XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
557557
}
558558

559+
- (void)testModifyingOptionsThrows {
560+
FIROptions *options =
561+
[[FIROptions alloc] initWithGoogleAppID:kGoogleAppID GCMSenderID:kGCMSenderID];
562+
options.editingLocked = YES;
563+
564+
// Modification to every property should result in an exception.
565+
XCTAssertThrows(options.androidClientID = @"should_throw");
566+
XCTAssertThrows(options.APIKey = @"should_throw");
567+
XCTAssertThrows(options.bundleID = @"should_throw");
568+
XCTAssertThrows(options.clientID = @"should_throw");
569+
XCTAssertThrows(options.databaseURL = @"should_throw");
570+
XCTAssertThrows(options.deepLinkURLScheme = @"should_throw");
571+
XCTAssertThrows(options.GCMSenderID = @"should_throw");
572+
XCTAssertThrows(options.googleAppID = @"should_throw");
573+
XCTAssertThrows(options.projectID = @"should_throw");
574+
XCTAssertThrows(options.storageBucket = @"should_throw");
575+
XCTAssertThrows(options.trackingID = @"should_throw");
576+
}
577+
559578
- (void)testVersionFormat {
560579
NSRegularExpression *sLibraryVersionRegex =
561580
[NSRegularExpression regularExpressionWithPattern:@"^[0-9]{8,}$" options:0 error:NULL];

‎Example/Firebase.xcodeproj/project.pbxproj

-10
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
7EE21F7C1FE8919E009B1370 /* FIREmailLinkSignInResponseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EE21F7B1FE8919D009B1370 /* FIREmailLinkSignInResponseTests.m */; };
122122
7EFA2E041F71C93300DD354F /* FIRUserMetadataTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EFA2E031F71C93300DD354F /* FIRUserMetadataTests.m */; };
123123
923F824C206C4D8000034974 /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 923F824B206C4D8000034974 /* SafariServices.framework */; };
124-
923F824E206C4D8B00034974 /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 923F824D206C4D8B00034974 /* SafariServices.framework */; };
125124
923F824F206C4DA500034974 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE45C6641E7DA8CB009E6ACD /* XCTest.framework */; };
126125
923F8251206C4DC600034974 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 923F8250206C4DC500034974 /* UserNotifications.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
127126
923F8252206C4DD500034974 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
@@ -185,8 +184,6 @@
185184
D064E6B51ED9B31C001956DF /* FIRTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = DEE14D7C1E844677006FA992 /* FIRTestCase.m */; };
186185
D067EF831ED9BDE00095C27F /* Shared.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AFAF36F41EC28C25004BDEE5 /* Shared.xcassets */; };
187186
D067EF841ED9BDFF0095C27F /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEE14D711E844677006FA992 /* GoogleService-Info.plist */; };
188-
D09005371EDB331C00154410 /* OCMock-iOS/OCMock.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = D09005301EDB32D600154410 /* OCMock-iOS/OCMock.framework */; settings = {ATTRIBUTES = (); }; };
189-
D090053D1EDB334D00154410 /* OCMock-iOS/OCMock.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = D09005301EDB32D600154410 /* OCMock-iOS/OCMock.framework */; settings = {ATTRIBUTES = (); }; };
190187
D0EDB2C51EDA04F800B6C31B /* Shared.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AFAF36F41EC28C25004BDEE5 /* Shared.xcassets */; };
191188
D0EDB2D71EDA057800B6C31B /* FIRAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D0EDB2D21EDA056A00B6C31B /* FIRAppDelegate.m */; };
192189
D0EDB2D81EDA057800B6C31B /* FIRViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0EDB2D41EDA056A00B6C31B /* FIRViewController.m */; };
@@ -877,7 +874,6 @@
877874
dstPath = "";
878875
dstSubfolderSpec = 16;
879876
files = (
880-
D09005371EDB331C00154410 /* OCMock-iOS/OCMock.framework in CopyFiles */,
881877
);
882878
runOnlyForDeploymentPostprocessing = 0;
883879
};
@@ -887,7 +883,6 @@
887883
dstPath = "";
888884
dstSubfolderSpec = 16;
889885
files = (
890-
D090053D1EDB334D00154410 /* OCMock-iOS/OCMock.framework in CopyFiles */,
891886
);
892887
runOnlyForDeploymentPostprocessing = 0;
893888
};
@@ -962,7 +957,6 @@
962957
7EFA2E031F71C93300DD354F /* FIRUserMetadataTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRUserMetadataTests.m; sourceTree = "<group>"; };
963958
8496034D8156555C5FCF8F14 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
964959
923F824B206C4D8000034974 /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = System/Library/Frameworks/SafariServices.framework; sourceTree = SDKROOT; };
965-
923F824D206C4D8B00034974 /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/SafariServices.framework; sourceTree = DEVELOPER_DIR; };
966960
923F8250206C4DC500034974 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
967961
AFAF36F41EC28C25004BDEE5 /* Shared.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Shared.xcassets; path = Shared/Shared.xcassets; sourceTree = "<group>"; };
968962
AFC8BAA11EC257D700B8EEAE /* Messaging_Example-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Messaging_Example-Bridging-Header.h"; sourceTree = "<group>"; };
@@ -987,7 +981,6 @@
987981
D064E6A41ED9B1BF001956DF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
988982
D064E6A61ED9B1BF001956DF /* Core-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Core-Info.plist"; sourceTree = "<group>"; };
989983
D064E6BF1ED9B31C001956DF /* Core_Tests_macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Core_Tests_macOS.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
990-
D09005301EDB32D600154410 /* OCMock-iOS/OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = "OCMock-iOS/OCMock.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
991984
D0EDB2CD1EDA04F800B6C31B /* Storage_Example_macOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Storage_Example_macOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
992985
D0EDB2D01EDA056A00B6C31B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
993986
D0EDB2D11EDA056A00B6C31B /* FIRAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FIRAppDelegate.h; sourceTree = "<group>"; };
@@ -1386,7 +1379,6 @@
13861379
isa = PBXFrameworksBuildPhase;
13871380
buildActionMask = 2147483647;
13881381
files = (
1389-
923F824E206C4D8B00034974 /* SafariServices.framework in Frameworks */,
13901382
);
13911383
runOnlyForDeploymentPostprocessing = 0;
13921384
};
@@ -1766,8 +1758,6 @@
17661758
children = (
17671759
923F8250206C4DC500034974 /* UserNotifications.framework */,
17681760
923F824B206C4D8000034974 /* SafariServices.framework */,
1769-
923F824D206C4D8B00034974 /* SafariServices.framework */,
1770-
D09005301EDB32D600154410 /* OCMock-iOS/OCMock.framework */,
17711761
DE45C6641E7DA8CB009E6ACD /* XCTest.framework */,
17721762
DEB61E781E7C542600C04B96 /* libsqlite3.tbd */,
17731763
6003F58D195388D20070C39A /* Foundation.framework */,

‎Example/Firebase.xcodeproj/xcshareddata/xcschemes/Auth_ApiTests.xcscheme

+13
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForRunning = "YES"
11+
buildForTesting = "YES">
12+
<BuildableReference
13+
BuildableIdentifier = "primary"
14+
BlueprintIdentifier = "DE26D25C1F7049F1004AE1D3"
15+
BuildableName = "Auth_ApiTests.xctest"
16+
BlueprintName = "Auth_ApiTests"
17+
ReferencedContainer = "container:Firebase.xcodeproj">
18+
</BuildableReference>
19+
</BuildActionEntry>
20+
</BuildActionEntries>
821
</BuildAction>
922
<TestAction
1023
buildConfiguration = "Debug"

‎Example/Firebase.xcodeproj/xcshareddata/xcschemes/Auth_EarlGreyTests.xcscheme

+13
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForRunning = "YES"
11+
buildForTesting = "YES">
12+
<BuildableReference
13+
BuildableIdentifier = "primary"
14+
BlueprintIdentifier = "DE26D26C1F705C35004AE1D3"
15+
BuildableName = "Auth_EarlGreyTests.xctest"
16+
BlueprintName = "Auth_EarlGreyTests"
17+
ReferencedContainer = "container:Firebase.xcodeproj">
18+
</BuildableReference>
19+
</BuildActionEntry>
20+
</BuildActionEntries>
821
</BuildAction>
922
<TestAction
1023
buildConfiguration = "Debug"

‎Example/Firebase.xcodeproj/xcshareddata/xcschemes/Core_Tests_tvOS.xcscheme

+13
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForRunning = "YES"
11+
buildForTesting = "YES">
12+
<BuildableReference
13+
BuildableIdentifier = "primary"
14+
BlueprintIdentifier = "DEAAD3941FBA11270053BF48"
15+
BuildableName = "Core_Tests_tvOS.xctest"
16+
BlueprintName = "Core_Tests_tvOS"
17+
ReferencedContainer = "container:Firebase.xcodeproj">
18+
</BuildableReference>
19+
</BuildActionEntry>
20+
</BuildActionEntries>
821
</BuildAction>
922
<TestAction
1023
buildConfiguration = "Debug"

‎Example/Firebase.xcodeproj/xcshareddata/xcschemes/Database_Tests_iOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<BuildActionEntries>
99
<BuildActionEntry
1010
buildForTesting = "YES"
11-
buildForRunning = "NO"
11+
buildForRunning = "YES"
1212
buildForProfiling = "NO"
1313
buildForArchiving = "NO"
1414
buildForAnalyzing = "NO">

‎Example/Firebase.xcodeproj/xcshareddata/xcschemes/Database_Tests_tvOS.xcscheme

+13
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForRunning = "YES"
11+
buildForTesting = "YES">
12+
<BuildableReference
13+
BuildableIdentifier = "primary"
14+
BlueprintIdentifier = "DE1EC27E1FBA5E63007D18D8"
15+
BuildableName = "Database_Tests_tvOS.xctest"
16+
BlueprintName = "Database_Tests_tvOS"
17+
ReferencedContainer = "container:Firebase.xcodeproj">
18+
</BuildableReference>
19+
</BuildActionEntry>
20+
</BuildActionEntries>
821
</BuildAction>
922
<TestAction
1023
buildConfiguration = "Debug"

‎Example/Firebase.xcodeproj/xcshareddata/xcschemes/DynamicLinks_Tests_iOS.xcscheme

+12
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForRunning = "YES">
11+
<BuildableReference
12+
BuildableIdentifier = "primary"
13+
BlueprintIdentifier = "DE17A2B3214215C0002A15ED"
14+
BuildableName = "DynamicLinks_Example_iOS.app"
15+
BlueprintName = "DynamicLinks_Example_iOS"
16+
ReferencedContainer = "container:Firebase.xcodeproj">
17+
</BuildableReference>
18+
</BuildActionEntry>
19+
</BuildActionEntries>
820
</BuildAction>
921
<TestAction
1022
buildConfiguration = "Debug"

‎Example/Firebase.xcodeproj/xcshareddata/xcschemes/FDLBuilderTestAppObjCEarlGrey.xcscheme

+13
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForRunning = "YES"
11+
buildForTesting = "YES">
12+
<BuildableReference
13+
BuildableIdentifier = "primary"
14+
BlueprintIdentifier = "DE4A62DC214816BD00670B27"
15+
BuildableName = "FDLBuilderTestAppObjCEarlGrey.xctest"
16+
BlueprintName = "FDLBuilderTestAppObjCEarlGrey"
17+
ReferencedContainer = "container:Firebase.xcodeproj">
18+
</BuildableReference>
19+
</BuildActionEntry>
20+
</BuildActionEntries>
821
</BuildAction>
922
<TestAction
1023
buildConfiguration = "Debug"

‎Example/Firebase.xcodeproj/xcshareddata/xcschemes/Storage_Tests_tvOS.xcscheme

+13
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForRunning = "YES"
11+
buildForTesting = "YES">
12+
<BuildableReference
13+
BuildableIdentifier = "primary"
14+
BlueprintIdentifier = "DEAAD3F41FBA46AB0053BF48"
15+
BuildableName = "Storage_Tests_tvOS.xctest"
16+
BlueprintName = "Storage_Tests_tvOS"
17+
ReferencedContainer = "container:Firebase.xcodeproj">
18+
</BuildableReference>
19+
</BuildActionEntry>
20+
</BuildActionEntries>
821
</BuildAction>
922
<TestAction
1023
buildConfiguration = "Debug"

‎Example/Podfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment the next two lines for pre-release testing
2-
#source 'sso://cpdc-internal/spec'
2+
#source 'sso://cpdc-internal/firebase'
33
#source 'https://github.com/CocoaPods/Specs.git'
44

55
use_frameworks!
@@ -15,7 +15,7 @@ target 'Core_Example_iOS' do
1515
# The next line is the forcing function for the Firebase pod. The Firebase
1616
# version's subspecs should depend on the component versions in their
1717
# corresponding podspec's.
18-
pod 'Firebase/CoreOnly', '5.10.0'
18+
pod 'Firebase/CoreOnly', '5.11.0'
1919

2020
target 'Core_Tests_iOS' do
2121
inherit! :search_paths

0 commit comments

Comments
 (0)