Merge branch 'master' into bs-auth-cleanup

* master: (128 commits)
  Add a nanopb string (#1839)
  Update Auth samples to sync with internal changes (#2056)
  Add clang-format installation instructions (#2057)
  Delete Firestore public C++ API (#2050)
  Porting Multi-Tab Structural Changes (#2049)
  Remove Mutation tombstones (#2052)
  Release 5.12.0 (#2051)
  Fix analyze errors (#2047)
  Isolate Firestore nanopb messages in C++ namespaces (#2046)
  Fix auth multi app support (#2043)
  Add missing nanopb flag (#2042)
  Delete deprecated files (#2038)
  Address travis timeout flakes (#2033)
  Fix tablet layout for in-app messaging (#2032)
  Held Write Acks Changelog (#2037)
  Remove Held Write Acks (#2029)
  Move #2034 into 5.12.0 (#2036)
  Partially revert "Update CHANGELOG for Firestore v0.14.0 (#2025)" (#2031)
  Revert "gRPC: replace Objective-C implementation with the new C++ implementation (#1968)" (#2030)
  Update CHANGELOG.md for #2034 (#2035)
  ...

Author: bstpierr

.travis.yml

@@ -1,5 +1,5 @@
 os: osx
-osx_image: xcode9.4
+osx_image: xcode10
 language: objective-c
 cache:
   - bundler
@@ -33,8 +33,14 @@ jobs:
       env:
         - PROJECT=Firebase PLATFORM=iOS METHOD=xcodebuild
       before_install:
-        - npm install ios-sim -g
-        - ios-sim start --devicetypeid "com.apple.CoreSimulator.SimDeviceType.iPhone-8-Plus, 11.3"
+        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+      script:
+        - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
+
+    - stage: test
+      env:
+        - PROJECT=InAppMessagingDisplay PLATFORM=iOS METHOD=xcodebuild
+      before_install:
         - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
       script:
         - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
@@ -64,6 +70,7 @@ jobs:
         - ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseMessaging.podspec
         - ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseStorage.podspec
         - ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseFunctions.podspec
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseInAppMessagingDisplay.podspec
 
     - stage: test
       env:
@@ -93,6 +100,7 @@ jobs:
         - ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseMessaging.podspec --use-libraries --allow-warnings
         - ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseStorage.podspec --use-libraries
         - ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseFunctions.podspec --use-libraries
+        - ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseInAppMessagingDisplay.podspec --use-libraries
 
     - stage: test
       env:
@@ -106,6 +114,36 @@ jobs:
 
     # Alternative platforms
 
+    # Xcode 9
+    - stage: test
+      osx_image: xcode9.4
+      env:
+        - PROJECT=Firebase PLATFORM=iOS METHOD=xcodebuild
+      before_install:
+        - npm install ios-sim -g
+        - ios-sim start --devicetypeid "com.apple.CoreSimulator.SimDeviceType.iPhone-8-Plus, 11.3"
+        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+      script:
+        - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
+
+    - stage: test
+      osx_image: xcode9.4
+      env:
+        - PROJECT=InAppMessagingDisplay PLATFORM=iOS METHOD=xcodebuild
+      before_install:
+        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+      script:
+        - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
+
+    - stage: test
+      osx_image: xcode9.4
+      env:
+        - PROJECT=Firestore PLATFORM=iOS METHOD=xcodebuild
+      before_install:
+        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+      script:
+        - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM $METHOD
+
     - stage: test
       env:
         - PROJECT=Firestore PLATFORM=macOS METHOD=cmake

CMakeLists.txt

@@ -89,12 +89,12 @@ set(BUILD_TESTING ${old_build_testing} CACHE BOOL "Restore BUILD_TESTING" FORCE)
 
 
 # gRPC
-find_package(OpenSSL)
+find_package(OpenSSL QUIET)
 if(OPENSSL_FOUND)
   set(gRPC_SSL_PROVIDER package CACHE STRING "Use external OpenSSL")
 endif()
 
-find_package(ZLIB)
+find_package(ZLIB QUIET)
 if(ZLIB_FOUND)
   set(gRPC_ZLIB_PROVIDER package CACHE STRING "Use external ZLIB")
 endif()

Carthage.md

@@ -3,13 +3,12 @@
 ## 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.
+[Carthage](https://github.com/Carthage/Carthage) distribution. Based on
+feedback and usage, the Firebase team may decide to [make the Carthage
+distribution official](https://github.com/firebase/firebase-ios-sdk/issues/1862).
 
 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.
+have suggestions or questions.
 
 ## Carthage Installation
 
@@ -28,7 +27,7 @@ more details and additional installation methods.
 
 - Create a Cartfile with a **subset** of the following components - choosing the
 Firebase components that you want to include in your app. Note that
-**FirebaseAnalytics** must always be included.
+**FirebaseAnalyticsBinary** 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"
@@ -39,6 +38,8 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.js
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDynamicLinksBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInAppMessagingBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInAppMessagingDisplayBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInvitesBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMessagingBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMLModelInterpreterBinary.json"
@@ -55,8 +56,8 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseStorageBinary.jso
 - 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`.
+- Add `$(OTHER_LDFLAGS) -ObjC` flag to "Other Linker Flags" in "Build Settings".
+- Make sure that the build target(s) includes your project's `GoogleService-Info.plist` ([how to download config file](https://support.google.com/firebase/answer/7015592))
 - [Delete Firebase.framework from the Link Binary With Libraries Build Phase](https://github.com/firebase/firebase-ios-sdk/issues/911#issuecomment-372455235).
 - If you're including a Firebase component that has resources, copy its bundles
     into the Xcode project and make sure they're added to the

Example/Auth/ApiTests/FirebaseAuthApiTests.m

@@ -23,8 +23,6 @@
 
 #ifdef NO_NETWORK
 #import "ITUIOSTestUtil.h"
-#import "ioReplayer/IORManager.h"
-#import "ioReplayer/IORTestCase.h"
 #endif
 
 #import <GTMSessionFetcher/GTMSessionFetcher.h>
@@ -93,11 +91,8 @@
 #define SKIP_IF_ON_MOBILE_HARNESS
 #endif
 
-#ifdef NO_NETWORK
-@interface ApiTests : IORTestCase
-#else
 @interface ApiTests : XCTestCase
-#endif
+
 @end
 
 @implementation ApiTests

Example/Auth/EarlGreyTests/FirebaseAuthEarlGreyTests.m

@@ -21,10 +21,6 @@
 #import <FirebaseCore/FIRApp.h>
 #import "FirebaseAuth.h"
 
-#ifdef NO_NETWORK
-#import "ioReplayer/IORTestCase.h"
-#endif
-
 /** The url for obtaining a valid custom token string used to test BYOAuth. */
 static NSString *const kCustomTokenUrl = @"https://fb-sa-1211.appspot.com/token";
 
@@ -38,11 +34,7 @@
 
 static NSTimeInterval const kWaitForElementTimeOut = 5;
 
-#ifdef NO_NETWORK
-@interface BasicUITest : IORTestCase
-#else
 @interface BasicUITest :XCTestCase
-#endif
 @end
 
 /** Convenience function for EarlGrey tests. */

Example/Auth/Sample/AppManager.m

@@ -22,11 +22,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-// Declares a private method of FIRInstanceID to work around a bug.
-@interface FIRInstanceID : NSObject
-+ (void)notifyTokenRefresh;
-@end
-
 @implementation AppManager {
   /** @var _createdAppNames
       @brief The set of names of live (created but not deleted) app, to avoid iCore warnings.
@@ -59,7 +54,6 @@ - (void)recreateAppAtIndex:(int)index
                 completion:(void (^)())completion {
   [self deleteAppAtIndex:index completion:^() {
     if (index == 0) {
-      [FIRInstanceID notifyTokenRefresh];  // b/28967043
       if (options) {
         [FIRApp configureWithOptions:options];
       }

Example/Auth/Sample/MainViewController.m

@@ -861,11 +861,11 @@ - (void)updateTable {
         }],
         [StaticContentTableViewCell cellWithTitle:kUnlinkFromFacebook
                                            action:^{
-          [weakSelf unlinkFromProvider:FIRGoogleAuthProviderID completion:nil];
+          [weakSelf unlinkFromProvider:FIRFacebookAuthProviderID completion:nil];
         }],
         [StaticContentTableViewCell cellWithTitle:kUnlinkFromEmailPassword
                                            action:^{
-          [weakSelf unlinkFromProvider:FIRGoogleAuthProviderID completion:nil];
+          [weakSelf unlinkFromProvider:FIREmailAuthProviderID completion:nil];
         }]
       ]],
       [StaticContentTableViewSection sectionWithTitle:kSectionTitleApp cells:@[

Example/Auth/Sample/SettingsViewController.m

@@ -281,6 +281,21 @@ - (NSString *)projectIDForAppAtIndex:(int)index {
   return @"[none]";
 }
 
+/** @fn googleAppIDForAppAtIndex:
+ @brief Returns the Google App ID for the Firebase app at the given index.
+ @param index The index for the app in the app manager.
+ @return The Google App ID of the project.
+ */
+- (NSString *)googleAppIDForAppAtIndex:(int)index {
+  NSString *APIKey = [[AppManager sharedInstance] appAtIndex:index].options.APIKey;
+  for (FIROptions *options in gFirebaseAppOptions) {
+    if ([options.APIKey isEqualToString:APIKey]) {
+      return options.googleAppID;
+    }
+  }
+  return @"[none]";
+}
+
 /** @fn toggleProjectForAppAtIndex:
     @brief Toggles the Firebase project for the Firebase app at the given index by recreating the
         FIRApp instance with different options.
@@ -295,10 +310,19 @@ - (void)toggleProjectForAppAtIndex:(int)index {
       break;
     }
   }
-  // For non-default apps, `nil` is considered the next option after the last options in the array.
-  int useNil = index > 0;
-  optionIndex = (optionIndex + 1 + useNil) % (gFirebaseAppOptions.count + useNil) - useNil;
-  FIROptions *options = optionIndex >= 0 ? gFirebaseAppOptions[optionIndex] : nil;
+
+  FIROptions *options;
+  if (index == 0) {
+    // For default apps, the next options cannot be `nil`.
+    optionIndex = (optionIndex + 1) % gFirebaseAppOptions.count;
+    options = gFirebaseAppOptions[optionIndex];
+  } else {
+    // For non-default apps, `nil` is considered the next options after the last options in the array.
+    optionIndex = (optionIndex + 1) % (gFirebaseAppOptions.count + 1);
+    if (optionIndex != gFirebaseAppOptions.count) {
+      options = gFirebaseAppOptions[optionIndex];
+    }
+  }
   __weak typeof(self) weakSelf = self;
   [[AppManager sharedInstance] recreateAppAtIndex:index withOptions:options completion:^() {
     dispatch_async(dispatch_get_main_queue(), ^() {

Example/Auth/Tests/FIRAuthDispatcherTests.m

@@ -22,7 +22,7 @@
     @brief The maximum difference between time intervals (in seconds), after which they will be
     considered different.
  */
-static const NSTimeInterval kMaxDifferenceBetweenTimeIntervals = 0.1;
+static const NSTimeInterval kMaxDifferenceBetweenTimeIntervals = 0.3;
 
 /** @var kTestDelay
     @brief Fake time delay before tasks are dispatched.