Merge branch 'master' of https://github.com/firebase/firebase-ios-sdk into fix-reason-parameter

Author: Ivan164

.travis.yml

@@ -13,9 +13,9 @@ before_install:
   - bundle exec pod install --project-directory=Firestore/Example --no-repo-update
 
 script:
-  - "! git grep ' $'" # Fail on trailing whitespace
+  - "! git grep -I ' $'" # Fail on trailing whitespace in non-binary files
   - ./test.sh
-  - pod lib lint FirebaseCommunity.podspec --verbose | tail -40
+  - pod lib lint FirebaseCommunity.podspec
 
 branches:
   only:

Example/Auth/Sample/[email protected]

@@ -135,10 +135,17 @@
       "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
       "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
       "scale" : "2x"
     },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "[email protected]",
+      "scale" : "1x"
+    },
     {
       "idiom" : "mac",
       "size" : "16x16",

Example/Auth/Sample/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -2537,7 +2537,9 @@ - (void)signInWithPhoneNumber:(NSString *_Nullable)phoneNumber
         if (error) {
           [self logFailure:@"failed to send verification code" error:error];
           [self showMessagePrompt:error.localizedDescription];
-          completion(error);
+          if (completion) {
+            completion(error);
+          }
           return;
         }
         [self logSuccess:@"Code sent"];

Example/Auth/Sample/Images.xcassets/AppIcon.appiconset/[email protected]

@@ -334,10 +334,8 @@
 		DE26D2561F7040B2004AE1D3 /* UserInfoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DE26D1F51F70333E004AE1D3 /* UserInfoViewController.xib */; };
 		DE26D2571F7040E0004AE1D3 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = DE26D1DA1F70333E004AE1D3 /* Localizable.strings */; };
 		DE26D2581F7040E4004AE1D3 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DE26D1E41F70333E004AE1D3 /* Images.xcassets */; };
-		DE26D2671F704A08004AE1D3 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = DE26D1CA1F70330A004AE1D3 /* Info.plist */; };
 		DE26D2681F704A0C004AE1D3 /* FirebaseAuthApiTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE26D1C91F70330A004AE1D3 /* FirebaseAuthApiTests.m */; };
 		DE26D2771F705CB5004AE1D3 /* FirebaseAuthEarlGreyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE26D1FA1F70333E004AE1D3 /* FirebaseAuthEarlGreyTests.m */; };
-		DE26D2781F705CBC004AE1D3 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = DE26D1FB1F70333E004AE1D3 /* Info.plist */; };
 		DE26D28F1F705F34004AE1D3 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = DE26D2001F70333E004AE1D3 /* GoogleService-Info.plist */; };
 		DE26D2901F705F39004AE1D3 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DE26D2041F70333E004AE1D3 /* Main.storyboard */; };
 		DE26D2911F705F3E004AE1D3 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DE26D2031F70333E004AE1D3 /* LaunchScreen.storyboard */; };
@@ -463,6 +461,8 @@
 		DEE14D921E84468D006FA992 /* FIRLoggerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DEE14D791E844677006FA992 /* FIRLoggerTest.m */; };
 		DEE14D931E84468D006FA992 /* FIROptionsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DEE14D7A1E844677006FA992 /* FIROptionsTest.m */; };
 		DEE14D941E84468D006FA992 /* FIRTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = DEE14D7C1E844677006FA992 /* FIRTestCase.m */; };
+		DEF288411F9AB6E100D480CF /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = DEF288401F9AB6E100D480CF /* [email protected] */; };
+		DEF288421F9AB6E100D480CF /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = DEF288401F9AB6E100D480CF /* [email protected] */; };
 		FFE130CF56C04A4F1F90F58C /* Pods_Core_Example_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 491500C8507A3B80D6FE1B61 /* Pods_Core_Example_macOS.framework */; };
 /* End PBXBuildFile section */
 
@@ -1162,6 +1162,7 @@
 		DEE14D7B1E844677006FA992 /* FIRTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRTestCase.h; sourceTree = "<group>"; };
 		DEE14D7C1E844677006FA992 /* FIRTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRTestCase.m; sourceTree = "<group>"; };
 		DEE14D7D1E844677006FA992 /* Tests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
+		DEF288401F9AB6E100D480CF /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		DF22AB406738B8C54A49A248 /* Pods-Auth_Tests_iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Auth_Tests_iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-Auth_Tests_iOS/Pods-Auth_Tests_iOS.release.xcconfig"; sourceTree = "<group>"; };
 		E1DB278AD387CAB5D57BF135 /* Pods_Storage_IntegrationTests_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Storage_IntegrationTests_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		E27502AAA61906D3F236AD2C /* Pods-Storage_Tests_macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Storage_Tests_macOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Storage_Tests_macOS/Pods-Storage_Tests_macOS.debug.xcconfig"; sourceTree = "<group>"; };
@@ -1796,6 +1797,7 @@
 		DE26D1CD1F70333E004AE1D3 /* Sample */ = {
 			isa = PBXGroup;
 			children = (
+				DEF288401F9AB6E100D480CF /* [email protected] */,
 				DE26D1EA1F70333E004AE1D3 /* Sample.entitlements */,
 				DE26D1EB1F70333E004AE1D3 /* SampleTemplate.entitlements */,
 				DE26D1CF1F70333E004AE1D3 /* ApplicationDelegate.h */,
@@ -3018,6 +3020,7 @@
 				DE26D2561F7040B2004AE1D3 /* UserInfoViewController.xib in Resources */,
 				DE26D2541F7040B2004AE1D3 /* MainViewController.xib in Resources */,
 				DE26D2571F7040E0004AE1D3 /* Localizable.strings in Resources */,
+				DEF288411F9AB6E100D480CF /* [email protected] in Resources */,
 				DE26D2551F7040B2004AE1D3 /* SettingsViewController.xib in Resources */,
 				DE26D2581F7040E4004AE1D3 /* Images.xcassets in Resources */,
 			);
@@ -3027,15 +3030,13 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DE26D2671F704A08004AE1D3 /* Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		DE26D26B1F705C35004AE1D3 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DE26D2781F705CBC004AE1D3 /* Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3044,6 +3045,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				DE26D28F1F705F34004AE1D3 /* GoogleService-Info.plist in Resources */,
+				DEF288421F9AB6E100D480CF /* [email protected] in Resources */,
 				DE26D2901F705F39004AE1D3 /* Main.storyboard in Resources */,
 				DE26D2911F705F3E004AE1D3 /* LaunchScreen.storyboard in Resources */,
 			);

Example/Auth/Sample/Images.xcassets/AppIcon.appiconset/[email protected]

@@ -103,8 +103,9 @@
       "scale" : "2x"
     },
     {
-      "idiom" : "ios-marketing",
       "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "[email protected]",
       "scale" : "1x"
     },
     {

Example/Auth/Sample/MainViewController.m

@@ -1,3 +1,6 @@
+# v4.3.1
+- Internal clean up.
+
 # v4.3.0
 - Provides account creation and last sign-in dates as metadata to the user
   object.

Example/Firebase.xcodeproj/project.pbxproj

@@ -4,7 +4,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FirebaseAuth'
-  s.version          = '4.3.0'
+  s.version          = '4.3.1'
   s.summary          = 'Firebase Open Source Libraries for iOS.'
 
   s.description      = <<-DESC

Example/Shared/Shared.xcassets/AppIcon.appiconset/Contents.json

@@ -40,6 +40,22 @@ static id noop(id object, SEL cmd, ...) {
 }
 #endif
 
+/** @fn isIOS9orLater
+    @brief Checks whether the iOS version is 9 or later.
+    @returns Whether the iOS version is 9 or later.
+ */
+static BOOL isIOS9orLater() {
+#if defined(__IPHONE_11_0) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_11_0)
+  if (@available(iOS 9.0, *)) {
+    return YES;
+  }
+  return NO;
+#else
+  // UIApplicationOpenURLOptionsAnnotationKey is only available on iOS 9+.
+  return &UIApplicationOpenURLOptionsAnnotationKey != NULL;
+#endif
+}
+
 @implementation FIRAuthAppDelegateProxy {
   /** @var _appDelegate
       @brief The application delegate whose method is being swizzled.
@@ -119,7 +135,7 @@ - (nullable instancetype)initWithApplication:(nullable UIApplication *)applicati
     SEL openURLOptionsSelector = @selector(application:openURL:options:);
     SEL openURLAnnotationSelector = @selector(application:openURL:sourceApplication:annotation:);
     SEL handleOpenURLSelector = @selector(application:handleOpenURL:);
-    if (&UIApplicationOpenURLOptionsAnnotationKey &&  // the constant is only available on iOS 9+
+    if (isIOS9orLater() &&
         ([_appDelegate respondsToSelector:openURLOptionsSelector] ||
          (![_appDelegate respondsToSelector:openURLAnnotationSelector] &&
           ![_appDelegate respondsToSelector:handleOpenURLSelector]))) {

Example/Shared/Shared.xcassets/AppIcon.appiconset/[email protected]

@@ -30,6 +30,11 @@ @interface FIRAuthURLPresenter () <SFSafariViewControllerDelegate,
                                    FIRAuthWebViewControllerDelegate>
 @end
 
+// Disable unguarded availability warnings because SFSafariViewController is been used throughout
+// the code, including as an iVar, which cannot be simply excluded by @available check.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability"
+
 @implementation FIRAuthURLPresenter {
   /** @var _isPresenting
       @brief Whether or not some web-based content is being presented.
@@ -176,6 +181,8 @@ - (void)finishPresentationWithURL:(nullable NSURL *)URL
   }
 }
 
+#pragma clang diagnostic pop  // ignored "-Wunguarded-availability"
+
 @end
 
 NS_ASSUME_NONNULL_END

Firebase/Auth/CHANGELOG.md

@@ -27,10 +27,12 @@
 NSString *const kFIRServiceCrash = @"Crash";
 NSString *const kFIRServiceDatabase = @"Database";
 NSString *const kFIRServiceDynamicLinks = @"DynamicLinks";
+NSString *const kFIRServiceFirestore = @"Firestore";
 NSString *const kFIRServiceInstanceID = @"InstanceID";
 NSString *const kFIRServiceInvites = @"Invites";
 NSString *const kFIRServiceMessaging = @"Messaging";
 NSString *const kFIRServiceMeasurement = @"Measurement";
+NSString *const kFIRServicePerformance = @"Performance";
 NSString *const kFIRServiceRemoteConfig = @"RemoteConfig";
 NSString *const kFIRServiceStorage = @"Storage";
 NSString *const kGGLServiceAnalytics = @"Analytics";

Firebase/Auth/FirebaseAuth.podspec

@@ -42,7 +42,7 @@
 NSString *const kFIRLibraryVersionID =
     @"4"     // Major version (one or more digits)
     @"00"    // Minor version (exactly 2 digits)
-    @"09"    // Build number (exactly 2 digits)
+    @"10"    // Build number (exactly 2 digits)
     @"000";  // Fixed "000"
 // Plist file name.
 NSString *const kServiceInfoFileName = @"GoogleService-Info";

Firebase/Auth/Source/FIRAuthAppDelegateProxy.m

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseCommunity'
-  s.version          = '0.1.4'
+  s.version          = '0.1.5'
   s.summary          = 'Firebase Open Source Libraries for iOS.'
 
   s.description      = <<-DESC

Firebase/Auth/Source/FIRAuthURLPresenter.m

@@ -1,4 +1,6 @@
 # Unreleased
+
+# v0.9.1
 - [fixed] Fixed validation of nested arrays to allow indirect nesting
 
 # v0.9.0

Firebase/Core/FIRApp.m

@@ -176,6 +176,40 @@ - (void)testCanMergeServerTimestamps {
   XCTAssertTrue([document[@"time"] isKindOfClass:[NSDate class]]);
 }
 
+- (void)testCanDeleteFieldUsingMerge {
+  FIRDocumentReference *doc = [[self.db collectionWithPath:@"rooms"] documentWithAutoID];
+
+  NSDictionary<NSString *, id> *initialData = @{
+    @"untouched" : @YES,
+    @"foo" : @"bar",
+    @"nested" : @{@"untouched" : @YES, @"foo" : @"bar"}
+  };
+  NSDictionary<NSString *, id> *mergeData = @{
+    @"foo" : [FIRFieldValue fieldValueForDelete],
+    @"nested" : @{@"foo" : [FIRFieldValue fieldValueForDelete]}
+  };
+
+  [self writeDocumentRef:doc data:initialData];
+
+  XCTestExpectation *completed =
+      [self expectationWithDescription:@"testCanMergeDataWithAnExistingDocumentUsingSet"];
+
+  [doc setData:mergeData
+         options:[FIRSetOptions merge]
+      completion:^(NSError *error) {
+        XCTAssertNil(error);
+        [completed fulfill];
+      }];
+
+  [self awaitExpectations];
+
+  FIRDocumentSnapshot *document = [self readDocumentForRef:doc];
+  XCTAssertEqual(document[@"untouched"], @YES);
+  XCTAssertNil(document[@"foo"]);
+  XCTAssertEqual(document[@"nested.untouched"], @YES);
+  XCTAssertNil(document[@"nested.foo"]);
+}
+
 - (void)testMergeReplacesArrays {
   FIRDocumentReference *doc = [[self.db collectionWithPath:@"rooms"] documentWithAutoID];
 
@@ -680,6 +714,40 @@ - (void)testExposesFirestoreOnQueries {
   XCTAssertEqual(q.firestore, self.db);
 }
 
+- (void)testDocumentReferenceEquality {
+  FIRFirestore *firestore = self.db;
+  FIRDocumentReference *docRef = [firestore documentWithPath:@"foo/bar"];
+  XCTAssertEqualObjects([firestore documentWithPath:@"foo/bar"], docRef);
+  XCTAssertEqualObjects([docRef collectionWithPath:@"blah"].parent, docRef);
+
+  XCTAssertNotEqualObjects([firestore documentWithPath:@"foo/BAR"], docRef);
+
+  FIRFirestore *otherFirestore = [self firestore];
+  XCTAssertNotEqualObjects([otherFirestore documentWithPath:@"foo/bar"], docRef);
+}
+
+- (void)testQueryReferenceEquality {
+  FIRFirestore *firestore = self.db;
+  FIRQuery *query =
+      [[[firestore collectionWithPath:@"foo"] queryOrderedByField:@"bar"] queryWhereField:@"baz"
+                                                                                isEqualTo:@42];
+  FIRQuery *query2 =
+      [[[firestore collectionWithPath:@"foo"] queryOrderedByField:@"bar"] queryWhereField:@"baz"
+                                                                                isEqualTo:@42];
+  XCTAssertEqualObjects(query, query2);
+
+  FIRQuery *query3 =
+      [[[firestore collectionWithPath:@"foo"] queryOrderedByField:@"BAR"] queryWhereField:@"baz"
+                                                                                isEqualTo:@42];
+  XCTAssertNotEqualObjects(query, query3);
+
+  FIRFirestore *otherFirestore = [self firestore];
+  FIRQuery *query4 = [[[otherFirestore collectionWithPath:@"foo"] queryOrderedByField:@"bar"]
+      queryWhereField:@"baz"
+            isEqualTo:@42];
+  XCTAssertNotEqualObjects(query, query4);
+}
+
 - (void)testCanTraverseCollectionsAndDocuments {
   NSString *expected = @"a/b/c/d";
   // doc path from root Firestore.

Firebase/Core/FIROptions.m

@@ -62,18 +62,13 @@ - (void)testCanReadAndWriteTimestampFields {
 }
 
 - (void)testCanReadAndWriteDocumentReferences {
-  // We can't use assertSuccessfulRoundtrip since FIRDocumentReference doesn't implement isEqual.
-  FIRDocumentReference *docRef = [self.db documentWithPath:@"rooms/eros"];
-  id data = @{ @"a" : @42, @"ref" : docRef };
-  [self writeDocumentRef:docRef data:data];
-
-  FIRDocumentSnapshot *readDoc = [self readDocumentForRef:docRef];
-  XCTAssertTrue(readDoc.exists);
+  FIRDocumentReference *docRef = [self documentRef];
+  [self assertSuccessfulRoundtrip:@{ @"a" : @42, @"ref" : docRef }];
+}
 
-  XCTAssertEqualObjects(readDoc[@"a"], data[@"a"]);
-  FIRDocumentReference *readDocRef = readDoc[@"ref"];
-  XCTAssertTrue([readDocRef isKindOfClass:[FIRDocumentReference class]]);
-  XCTAssertEqualObjects(readDocRef.path, docRef.path);
+- (void)testCanReadAndWriteDocumentReferencesInArrays {
+  FIRDocumentReference *docRef = [self documentRef];
+  [self assertSuccessfulRoundtrip:@{ @"a" : @42, @"refs" : @[ docRef ] }];
 }
 
 @end

FirebaseCommunity.podspec

@@ -280,7 +280,9 @@ - (void)testWritesWithReservedFieldsFail {
 
 - (void)testSetsWithFieldValueDeleteFail {
   [self expectSet:@{@"foo" : [FIRFieldValue fieldValueForDelete]}
-      toFailWithReason:@"FieldValue.delete() can only be used with updateData()."];
+      toFailWithReason:
+          @"FieldValue.delete() can only be used with updateData() and setData() with "
+          @"SetOptions.merge()."];
 }
 
 - (void)testUpdatesWithNestedFieldValueDeleteFail {

Firestore/CHANGELOG.md

@@ -263,8 +263,10 @@ - (void)receiveWatchStreamError:(int)errorCode userInfo:(NSDictionary<NSString *
       [NSError errorWithDomain:FIRFirestoreErrorDomain code:errorCode userInfo:userInfo];
 
   [self.datastore failWatchStreamWithError:error];
-  // Unlike web, stream should re-open synchronously
-  FSTAssert(self.datastore.isWatchStreamOpen, @"Watch stream is open");
+  // Unlike web, stream should re-open synchronously (if we have any listeners)
+  if (self.queryListeners.count > 0) {
+    FSTAssert(self.datastore.isWatchStreamOpen, @"Watch stream is open");
+  }
 }
 
 - (NSDictionary<FSTDocumentKey *, FSTBoxedTargetID *> *)currentLimboDocuments {