firebase · rsgowman · Mar 8, 2018 · Jan 11, 2018 · Jan 11, 2018 · Jan 11, 2018
diff --git a/.gitignore b/.gitignore
@@ -58,6 +58,9 @@ Pods/
 Podfile.lock
 *.xcworkspace
 
+# Firestore's build configuration, as generated by CocoaPods
+Firestore/core/src/firebase/firestore/util/config.h
+
 # CMake
 .downloads
 Debug

diff --git a/.travis.yml b/.travis.yml
@@ -12,13 +12,46 @@ before_install:
   - gem install xcpretty
   - bundle exec pod install --project-directory=Example --repo-update
   - bundle exec pod install --project-directory=Firestore/Example --no-repo-update
+  - brew install clang-format
+  - brew install swiftformat
+  - brew install cmake
+  - brew install go # Somehow the build for Abseil requires this.
+  - echo "$TRAVIS_COMMIT_RANGE"
+  - echo "$TRAVIS_PULL_REQUEST"
+  - |
+    if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+      SKIP_FIREBASE=0
+      SKIP_FIRESTORE=0
+    else
+      git diff --name-only $TRAVIS_COMMIT_RANGE | grep -Eq '^(Firebase|Example)'
+      SKIP_FIREBASE="$?"
+      git diff --name-only $TRAVIS_COMMIT_RANGE | grep -q Firestore
+      SKIP_FIRESTORE="$?"
+    fi
 
 script:
-  - "! git grep -I ' $'" # Fail on trailing whitespace in non-binary files
-  - ./test.sh
+  # Fail on trailing whitespace in non-binary, non-generated-nanopb files
+  - "! git grep -I ' $' ':(exclude)Firestore/Protos/nanopb'"
+  - "! git grep -EL --name-only 'Copyright [0-9]{4}.*Google' | grep -v third_party | egrep '\\.(m|h|cc|mm|c)$'"
+  - ./scripts/style.sh test-only # Validate clang-format compliance
+  - |
+    if [ $SKIP_FIREBASE != 1 ]; then
+      ./test.sh
+    fi
+  - |
+    if [ $SKIP_FIRESTORE != 1 ]; then
+      ./scripts/lint.sh # Google C++ style compliance
+    fi
+  - |
+    if [ $SKIP_FIRESTORE != 1 ]; then
+      ./Firestore/test.sh
+    fi
 
 # TODO fix os_log deprecation warning in FIRLogger to remove --allow-warnings
-  - bundle exec pod lib lint FirebaseCore.podspec --allow-warnings
+  - |
+    if [ $SKIP_FIREBASE != 1 ]; then
+      bundle exec pod lib lint FirebaseCore.podspec --allow-warnings
+    fi
 
 # TODO - Uncomment subsequent lines once FirebaseCore source repo is in public Specs repo
 #  - bundle exec pod lib lint FirebaseAuth.podspec

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,7 +37,9 @@ set(FIREBASE_INSTALL_DIR ${PROJECT_BINARY_DIR})
 enable_testing()
 
 include(external/FirebaseCore)
-
 include(external/googletest)
 include(external/leveldb)
+include(external/grpc)
+include(external/protobuf)
+include(external/nanopb)
 include(external/firestore)
diff --git a/Carthage.md b/Carthage.md
@@ -0,0 +1,72 @@
+# Firebase Carthage
+
+## Context
+
+This page introduces and provides instructions for an **experimental** Firebase
+[Carthage](https://github.com/Carthage/Carthage) implementation. Based on
+feedback and usage, the Firebase team may decide to make the Carthage
+distribution official.
+
+FirebaseFirestore and FirebaseInvites are not yet supported from Carthage.
+Please [let us know](https://github.com/firebase/firebase-ios-sdk/issues) if you
+have suggestions about how best to distribute Carthage binaries that include
+resource bundles.
+
+## Carthage Installation
+
+[Homebrew](http://brew.sh/) is one way to install Carthage.
+
+```bash
+$ brew update
+$ brew install carthage
+```
+
+See the
+[Carthage page](https://github.com/Carthage/Carthage#installing-carthage) for
+more details and additional installation methods.
+
+## Carthage Usage
+
+- Create a Cartfile with a **subset** of the following components. Note that
+    **FirebaseAnalytics** must always be included.
+```
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseABTestingBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAdMobBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseCrashBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDynamicLinksBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMessagingBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebasePerformanceBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseStorageBinary.json"
+```
+- Run `carthage update`
+- Use Finder to open `Carthage/Build/iOS`.
+- Copy the contents into the top level of your Xcode project and make sure
+    they're added to the right build target(s).
+- Add the -ObjC flag to "Other Linker Flags".
+- Make sure that the build target(s) includes your project's `GoogleService-Info.plist`.
+
+## Versioning
+
+Unlike the CocoaPods distribution, the Carthage distribution is like the
+Firebase zip release in that all the Firebase components share the same version.
+Mixing and matching components with different versions may cause linker errors.
+
+## Static Frameworks
+
+Note that the Firebase frameworks in the distribution include static libraries.
+While it is fine to link these into apps, it will generally not work to depend
+on them from wrapper dynamic frameworks.
+
+## Acknowledgements
+
+Thanks to the Firebase community for encouraging this implementation including
+those who have made this the most updated
+[firebase-ios-sdk](https://github.com/firebase/firebase-ios-sdk)
+[issue](https://github.com/firebase/firebase-ios-sdk/issues/9).
+
+Thanks also to those who have already done Firebase Carthage implementations,
+such as https://github.com/soheilbm/Firebase.
diff --git a/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m b/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m
@@ -34,7 +34,7 @@
 /** @var gCreateNewObject
     @brief A block that returns a new object everytime it is called.
  */
-static id _Nullable (^gCreateNewObject)() = ^id _Nullable() {
+static id _Nullable (^gCreateNewObject)(void) = ^id _Nullable() {
   return [[NSObject alloc] init];
 };
 

diff --git a/Example/Core/Tests/FIRAppTest.m b/Example/Core/Tests/FIRAppTest.m
@@ -596,6 +596,27 @@ - (void)testIsAppConfigured {
   XCTAssertFalse([FIRApp isDefaultAppConfigured]);
 }
 
+- (void)testIllegalLibraryName {
+  [FIRApp registerLibrary:@"Oops>" withVersion:@"1.0.0"];
+  XCTAssertTrue([[FIRApp firebaseUserAgent] isEqualToString:@""]);
+}
+
+- (void)testIllegalLibraryVersion {
+  [FIRApp registerLibrary:@"LegalName" withVersion:@"1.0.0+"];
+  XCTAssertTrue([[FIRApp firebaseUserAgent] isEqualToString:@""]);
+}
+
+- (void)testSingleLibrary {
+  [FIRApp registerLibrary:@"LegalName" withVersion:@"1.0.0"];
+  XCTAssertTrue([[FIRApp firebaseUserAgent] containsString:@"LegalName/1.0.0"]);
+}
+
+- (void)testMultipleLibraries {
+  [FIRApp registerLibrary:@"LegalName" withVersion:@"1.0.0"];
+  [FIRApp registerLibrary:@"LegalName2" withVersion:@"2.0.0"];
+  XCTAssertTrue([[FIRApp firebaseUserAgent] containsString:@"LegalName/1.0.0 LegalName2/2.0.0"]);
+}
+
 #pragma mark - private
 
 - (NSDictionary<NSString *, NSObject *> *)expectedUserInfoWithAppName:(NSString *)name

diff --git a/Example/Core/Tests/FIRLoggerTest.m b/Example/Core/Tests/FIRLoggerTest.m
@@ -28,13 +28,13 @@
 
 extern const char *kFIRLoggerCustomASLMessageFormat;
 
-extern void FIRResetLogger();
+extern void FIRResetLogger(void);
 
-extern aslclient getFIRLoggerClient();
+extern aslclient getFIRLoggerClient(void);
 
-extern dispatch_queue_t getFIRClientQueue();
+extern dispatch_queue_t getFIRClientQueue(void);
 
-extern BOOL getFIRLoggerDebugMode();
+extern BOOL getFIRLoggerDebugMode(void);
 
 // Define the message format again to make sure the format doesn't accidentally change.
 static NSString *const kCorrectASLMessageFormat =

diff --git a/Example/Core/Tests/FIROptionsTest.m b/Example/Core/Tests/FIROptionsTest.m
@@ -25,7 +25,8 @@
 
 @interface FIROptions (Test)
 
-@property(nonatomic, readonly) NSDictionary *analyticsOptionsDictionary;
+- (nullable NSDictionary *)analyticsOptionsDictionaryWithInfoDictionary:
+    (nullable NSDictionary *)infoDictionary;
 
 @end
 
@@ -127,7 +128,7 @@ - (void)testInitCustomizedOptions {
 #pragma clang diagnostic pop
 }
 
-- (void)testinitWithContentsOfFile {
+- (void)testInitWithContentsOfFile {
   NSString *filePath =
       [[NSBundle mainBundle] pathForResource:@"GoogleService-Info" ofType:@"plist"];
   FIROptions *options = [[FIROptions alloc] initWithContentsOfFile:filePath];
@@ -263,22 +264,20 @@ - (void)testAnalyticsConstants {
 }
 
 - (void)testAnalyticsOptions {
-  id mainBundleMock = OCMPartialMock([NSBundle mainBundle]);
-
   // No keys anywhere.
   NSDictionary *optionsDictionary = nil;
   FIROptions *options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
   NSDictionary *mainDictionary = nil;
-  OCMExpect([mainBundleMock infoDictionary]).andReturn(mainDictionary);
   NSDictionary *expectedAnalyticsOptions = @{};
-  XCTAssertEqualObjects(options.analyticsOptionsDictionary, expectedAnalyticsOptions);
+  NSDictionary *analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:nil];
+  XCTAssertEqualObjects(analyticsOptions, expectedAnalyticsOptions);
 
   optionsDictionary = @{};
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
   mainDictionary = @{};
-  OCMExpect([mainBundleMock infoDictionary]).andReturn(mainDictionary);
   expectedAnalyticsOptions = @{};
-  XCTAssertEqualObjects(options.analyticsOptionsDictionary, expectedAnalyticsOptions);
+  analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:mainDictionary];
+  XCTAssertEqualObjects(analyticsOptions, expectedAnalyticsOptions);
 
   // Main has no keys.
   optionsDictionary = @{
@@ -288,9 +287,9 @@ - (void)testAnalyticsOptions {
   };
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
   mainDictionary = @{};
-  OCMExpect([mainBundleMock infoDictionary]).andReturn(mainDictionary);
   expectedAnalyticsOptions = optionsDictionary;
-  XCTAssertEqualObjects(options.analyticsOptionsDictionary, expectedAnalyticsOptions);
+  analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:mainDictionary];
+  XCTAssertEqualObjects(analyticsOptions, expectedAnalyticsOptions);
 
   // Main overrides all the keys.
   optionsDictionary = @{
@@ -304,9 +303,9 @@ - (void)testAnalyticsOptions {
     kFIRIsAnalyticsCollectionEnabled : @NO,
     kFIRIsMeasurementEnabled : @NO
   };
-  OCMExpect([mainBundleMock infoDictionary]).andReturn(mainDictionary);
   expectedAnalyticsOptions = mainDictionary;
-  XCTAssertEqualObjects(options.analyticsOptionsDictionary, expectedAnalyticsOptions);
+  analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:mainDictionary];
+  XCTAssertEqualObjects(analyticsOptions, expectedAnalyticsOptions);
 
   // Keys exist only in main.
   optionsDictionary = @{};
@@ -316,9 +315,9 @@ - (void)testAnalyticsOptions {
     kFIRIsAnalyticsCollectionEnabled : @YES,
     kFIRIsMeasurementEnabled : @YES
   };
-  OCMExpect([mainBundleMock infoDictionary]).andReturn(mainDictionary);
   expectedAnalyticsOptions = mainDictionary;
-  XCTAssertEqualObjects(options.analyticsOptionsDictionary, expectedAnalyticsOptions);
+  analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:mainDictionary];
+  XCTAssertEqualObjects(analyticsOptions, expectedAnalyticsOptions);
 
   // Main overrides single keys.
   optionsDictionary = @{
@@ -328,13 +327,13 @@ - (void)testAnalyticsOptions {
   };
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
   mainDictionary = @{ kFIRIsAnalyticsCollectionDeactivated : @NO };
-  OCMExpect([mainBundleMock infoDictionary]).andReturn(mainDictionary);
   expectedAnalyticsOptions = @{
     kFIRIsAnalyticsCollectionDeactivated : @NO,  // override
     kFIRIsAnalyticsCollectionEnabled : @YES,
     kFIRIsMeasurementEnabled : @YES
   };
-  XCTAssertEqualObjects(options.analyticsOptionsDictionary, expectedAnalyticsOptions);
+  analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:mainDictionary];
+  XCTAssertEqualObjects(analyticsOptions, expectedAnalyticsOptions);
 
   optionsDictionary = @{
     kFIRIsAnalyticsCollectionDeactivated : @YES,
@@ -343,13 +342,13 @@ - (void)testAnalyticsOptions {
   };
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
   mainDictionary = @{ kFIRIsAnalyticsCollectionEnabled : @NO };
-  OCMExpect([mainBundleMock infoDictionary]).andReturn(mainDictionary);
   expectedAnalyticsOptions = @{
     kFIRIsAnalyticsCollectionDeactivated : @YES,
     kFIRIsAnalyticsCollectionEnabled : @NO,  // override
     kFIRIsMeasurementEnabled : @YES
   };
-  XCTAssertEqualObjects(options.analyticsOptionsDictionary, expectedAnalyticsOptions);
+  analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:mainDictionary];
+  XCTAssertEqualObjects(analyticsOptions, expectedAnalyticsOptions);
 
   optionsDictionary = @{
     kFIRIsAnalyticsCollectionDeactivated : @YES,
@@ -358,18 +357,18 @@ - (void)testAnalyticsOptions {
   };
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
   mainDictionary = @{ kFIRIsMeasurementEnabled : @NO };
-  OCMExpect([mainBundleMock infoDictionary]).andReturn(mainDictionary);
   expectedAnalyticsOptions = @{
     kFIRIsAnalyticsCollectionDeactivated : @YES,
     kFIRIsAnalyticsCollectionEnabled : @YES,
     kFIRIsMeasurementEnabled : @NO  // override
   };
-  XCTAssertEqualObjects(options.analyticsOptionsDictionary, expectedAnalyticsOptions);
+  analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:mainDictionary];
+  XCTAssertEqualObjects(analyticsOptions, expectedAnalyticsOptions);
 }
 
 - (void)testAnalyticsOptions_combinatorial {
   // Complete combinatorial test.
-  id mainBundleMock = OCMPartialMock([NSBundle mainBundle]);
+
   // Possible values for the flags in the plist, where NSNull means the flag is not present.
   NSArray *values = @[ [NSNull null], @NO, @YES ];
 
@@ -398,6 +397,7 @@ - (void)testAnalyticsOptions_combinatorial {
                 if (![optionsMeasurementEnabled isEqual:[NSNull null]]) {
                   optionsDictionary[kFIRIsMeasurementEnabled] = optionsMeasurementEnabled;
                 }
+
                 FIROptions *options =
                     [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
                 if (![uniqueOptionsCombinations containsObject:optionsDictionary]) {
@@ -415,7 +415,8 @@ - (void)testAnalyticsOptions_combinatorial {
                 if (![mainMeasurementEnabled isEqual:[NSNull null]]) {
                   mainDictionary[kFIRIsMeasurementEnabled] = mainMeasurementEnabled;
                 }
-                OCMExpect([mainBundleMock infoDictionary]).andReturn(mainDictionary);
+
+                // Add mainDictionary to uniqueMainCombinations if it isn't included yet.
                 if (![uniqueMainCombinations containsObject:mainDictionary]) {
                   [uniqueMainCombinations addObject:mainDictionary];
                 }
@@ -427,7 +428,10 @@ - (void)testAnalyticsOptions_combinatorial {
                 NSMutableDictionary *expectedAnalyticsOptions =
                     [[NSMutableDictionary alloc] initWithDictionary:optionsDictionary];
                 [expectedAnalyticsOptions addEntriesFromDictionary:mainDictionary];
-                XCTAssertEqualObjects(options.analyticsOptionsDictionary, expectedAnalyticsOptions);
+
+                NSDictionary *analyticsOptions =
+                    [options analyticsOptionsDictionaryWithInfoDictionary:mainDictionary];
+                XCTAssertEqualObjects(analyticsOptions, expectedAnalyticsOptions);
 
                 combinationCount++;
               }

diff --git a/Example/Database/Tests/Integration/FData.m b/Example/Database/Tests/Integration/FData.m
@@ -487,7 +487,7 @@ - (void) testLargeNumericKeysDontGetTurnedIntoArrays {
     [[ref child:@"100003354884401"] setValue:@"alpha"];
 
     __block BOOL ready = NO;
-    [ref observeEventType:FIRDataEventTypeValue withBlock:^(FIRDataSnapshot *snapshot) {
+    [ref observeSingleEventOfType:FIRDataEventTypeValue withBlock:^(FIRDataSnapshot *snapshot) {
         id val = [snapshot value];
         XCTAssertTrue([val isKindOfClass:[NSDictionary class]], @"Expected a dictionary.");
         ready = YES;
@@ -678,6 +678,8 @@ - (void) testSetAndThenListenForValueEventsAreCorrect {
     [self waitUntil:^BOOL{
         return setDone && calls == 1;
     }];
+
+    [node removeAllObservers];
 }
 
 - (void) testHasChildrenWorksCorrectly {
@@ -878,6 +880,7 @@ - (void) testListenForValueAndThenWriteOnANodeWithExistingData {
     [self waitUntil:^BOOL{
         return calls == 1;
     }];
+    [reader removeAllObservers];
 }
 
 - (void) testSetPriorityOnNonexistentNodeFails {
@@ -2208,6 +2211,7 @@ - (void) testParentDeleteShadowsChildListeners {
     }];
 
     WAIT_FOR(done);
+    [deleter removeAllObservers];
 }
 
 - (void) testParentDeleteShadowsChildListenersWithNonDefaultQuery {