Migrate travis to Xcode 10.3 and single platform builds (#3714)

.travis.yml

@@ -1,5 +1,5 @@
 os: osx
-osx_image: xcode10.1
+osx_image: xcode10.3
 language: objective-c
 cache:
   - bundler
@@ -23,9 +23,6 @@ jobs:
     # The order of builds matters (even though they are run in parallel):
     # Travis will schedule them in the same order they are listed here.
 
-    # Primary platforms
-
-    # Run unit tests
     - stage: test
       env:
         - PROJECT=Firebase PLATFORM=iOS METHOD=xcodebuild
@@ -36,20 +33,68 @@ jobs:
 
     - stage: test
       env:
-        - PROJECT=Core PLATFORM=iOS METHOD=pod-lib-lint
-      before_install:
-        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+        - PROJECT=Core METHOD=pod-lib-lint
       script:
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCore.podspec
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCore.podspec --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=ios
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=tvos
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=macos
 
     - stage: test
+      if: type = cron
       env:
-        - PROJECT=ABTesting PLATFORM=iOS METHOD=pod-lib-lint
+        - PROJECT=CoreCron METHOD=pod-lib-lint
       script:
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseABTesting.podspec --platforms=ios
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseABTesting.podspec --platforms=tvos
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseABTesting.podspec --platforms=macos
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=ios --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=tvos --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=macos --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=ios --use-modular-headers
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=tvos --use-modular-headers
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=macos --use-modular-headers
+
+    - stage: test
+      env:
+        - PROJECT=CoreDiagnostics METHOD=pod-lib-lint
+      script:
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCoreDiagnostics.podspec --platforms=ios
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCoreDiagnostics.podspec --platforms=tvos
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCoreDiagnostics.podspec --platforms=macos
+
+    - stage: test
+      if: type = cron
+      env:
+        - PROJECT=CoreDiagnosticsCron METHOD=pod-lib-lint
+      script:
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCoreDiagnostics.podspec --platforms=ios --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCoreDiagnostics.podspec --platforms=tvos --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCoreDiagnostics.podspec --platforms=macos --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCoreDiagnostics.podspec --platforms=ios --use-modular-headers
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCoreDiagnostics.podspec --platforms=tvos --use-modular-headers
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCoreDiagnostics.podspec --platforms=macos --use-modular-headers
+
+    - stage: test
+      env:
+        - PROJECT=ABTesting METHOD=pod-lib-lint
+      script:
+        # --allow-warnings is needed until Protobuf 3.10.0 releases with fix included with
+        # https://github.com/protocolbuffers/protobuf/pull/6464
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseABTesting.podspec --platforms=ios --allow-warnings
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseABTesting.podspec --platforms=tvos --allow-warnings
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseABTesting.podspec --platforms=macos --allow-warnings
+
+    - stage: test
+      if: type = cron
+      env:
+        - PROJECT=ABTestingCron METHOD=pod-lib-lint
+      script:
+        # --allow-warnings is needed until Protobuf 3.10.0 releases with fix included with
+        # https://github.com/protocolbuffers/protobuf/pull/6464
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseABTesting.podspec --platforms=ios --allow-warnings --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseABTesting.podspec --platforms=tvos --allow-warnings --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseABTesting.podspec --platforms=macos --allow-warnings --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseABTesting.podspec --platforms=ios --allow-warnings --use-modular-headers
+        # One of the next two consistently hang on Travis. Commenting for now.
+        # - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseABTesting.podspec --platforms=tvos --allow-warnings --use-modular-headers
+        # - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseABTesting.podspec --platforms=macos --allow-warnings --use-modular-headers
 
     - stage: test
       env:
@@ -63,13 +108,37 @@ jobs:
         - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
 
     - stage: test
+      if: type = cron
       env:
-        - PROJECT=InstanceID PLATFORM=iOS METHOD=pod-lib-lint
+        - PROJECT=AuthCron METHOD=pod-lib-lint
+      script:
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseAuth.podspec --platforms=ios --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseAuth.podspec --platforms=tvos --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseAuth.podspec --platforms=macos --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseAuth.podspec --platforms=ios --use-modular-headers
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseAuth.podspec --platforms=tvos --use-modular-headers
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseAuth.podspec --platforms=macos --use-modular-headers
+
+    - stage: test
+      env:
+        - PROJECT=InstanceID METHOD=pod-lib-lint
       script:
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseInstanceID.podspec --platforms=ios
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseInstanceID.podspec --platforms=tvos
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseInstanceID.podspec --platforms=macos
 
+    - stage: test
+      if: type = cron
+      env:
+        - PROJECT=InstanceIDCron METHOD=pod-lib-lint
+      script:
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseInstanceID.podspec --platforms=ios --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseInstanceID.podspec --platforms=tvos --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseInstanceID.podspec --platforms=macos --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseInstanceID.podspec --platforms=ios --use-modular-headers
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseInstanceID.podspec --platforms=tvos --use-modular-headers
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseInstanceID.podspec --platforms=macos --use-modular-headers
+
     - stage: test
       env:
         - PROJECT=Database PLATFORM=all METHOD=xcodebuild
@@ -78,13 +147,25 @@ jobs:
       script:
         - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
         # The pod lib lint tests are fast enough that it's not worth a separate stage.
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDatabase.podspec --skip-tests
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDatabase.podspec --use-libraries --skip-tests
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDatabase.podspec --use-modular-headers --skip-tests
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDatabase.podspec --skip-tests --platforms=ios
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDatabase.podspec --skip-tests --platforms=tvos
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDatabase.podspec --skip-tests --platforms=macos
+
+    - stage: test
+      if: type = cron
+      env:
+        - PROJECT=DatabaseCron METHOD=pod-lib-lint
+      script:
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDatabase.podspec --use-libraries --skip-tests --platforms=ios
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDatabase.podspec --use-libraries --skip-tests --platforms=tvos
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDatabase.podspec --use-libraries --skip-tests --platforms=macos
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDatabase.podspec --use-modular-headers --skip-tests --platforms=ios
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDatabase.podspec --use-modular-headers --skip-tests --platforms=tvos
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDatabase.podspec --use-modular-headers --skip-tests --platforms=macos
 
     - stage: test
       env:
-        - PROJECT=DynamicLinks PLATFORM=all METHOD=pod-lib-lint
+        - PROJECT=DynamicLinks METHOD=pod-lib-lint
       script:
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDynamicLinks.podspec
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDynamicLinks.podspec --use-libraries
@@ -92,21 +173,52 @@ jobs:
 
     - stage: test
       env:
-        - PROJECT=Messaging PLATFORM=all METHOD=xcodebuild
-      before_install:
-        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+        - PROJECT=Messaging METHOD=pod-lib-lint
       script:
-        # Run both build.sh and pod lib lint tests to get multi iOS version test coverage
-        - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseMessaging.podspec
+        # --allow-warnings is needed until Protobuf 3.10.0 releases with fix included with
+        # https://github.com/protocolbuffers/protobuf/pull/6464
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=ios --allow-warnings
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=tvos --allow-warnings
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=macos --allow-warnings
+
+    - stage: test
+      if: type = cron
+      env:
+        - PROJECT=MessagingCron METHOD=pod-lib-lint
+      script:
+        # --allow-warnings is needed until Protobuf 3.10.0 releases with fix included with
+        # https://github.com/protocolbuffers/protobuf/pull/6464
+        # FirebaseMessaging includes Swift unit tests so it is not testable with --use-libraries.
+        # TODO(paulb777): Migrate FirebaseMessaging to pod gen driven tests with a separate test
+        # target for Swift.
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=ios --allow-warnings --use-libraries --skip-tests
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=tvos --allow-warnings --use-libraries --skip-tests
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=macos --allow-warnings --use-libraries --skip-tests
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=ios --allow-warnings --use-modular-headers
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=tvos --allow-warnings --use-modular-headers
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=macos --allow-warnings --use-modular-headers
+
+    - stage: test
+      env:
+        - PROJECT=RemoteConfig METHOD=pod-lib-lint
+      script:
+        # --allow-warnings is needed until Protobuf 3.10.0 releases with fix included with
+        # https://github.com/protocolbuffers/protobuf/pull/6464
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --platforms=ios --allow-warnings
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --platforms=tvos --allow-warnings
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --platforms=macos --allow-warnings
 
     - stage: test
+      if: type = cron
       env:
-        - PROJECT=RemoteConfig PLATFORM=iOS METHOD=pod-lib-lint
+        - PROJECT=RemoteConfigCron METHOD=pod-lib-lint
       script:
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --platforms=ios
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --platforms=tvos
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --platforms=macos
+        - travis_retry ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --use-libraries --allow-warnings --platforms=ios --allow-warnings
+        - travis_retry ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --use-libraries --allow-warnings --platforms=tvos --allow-warnings
+        - travis_retry ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --use-libraries --allow-warnings --platforms=macos --allow-warnings
+        - travis_retry ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --use-modular-headers --platforms=ios --allow-warnings
+        - travis_retry ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --use-modular-headers --platforms=tvos --allow-warnings
+        - travis_retry ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --use-modular-headers --platforms=macos --allow-warnings
 
     - stage: test
       env:
@@ -116,13 +228,25 @@ jobs:
       script:
         - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
         # The pod lib lint tests are fast enough that it's not worth a separate stage.
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseStorage.podspec --skip-tests
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseStorage.podspec --use-libraries --skip-tests
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseStorage.podspec --use-modular-headers --skip-tests
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseStorage.podspec --skip-tests --platforms=ios
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseStorage.podspec --skip-tests --platforms=tvos
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseStorage.podspec --skip-tests --platforms=macos
 
     - stage: test
+      if: type = cron
       env:
-        - PROJECT=Functions PLATFORM=iOS METHOD=pod-lib-lint
+        - PROJECT=Storage METHOD=pod-lib-lint
+      script:
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseStorage.podspec --use-libraries --skip-tests --platforms=ios
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseStorage.podspec --use-libraries --skip-tests --platforms=tvos
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseStorage.podspec --use-libraries --skip-tests --platforms=macos
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseStorage.podspec --use-modular-headers --skip-tests --platforms=ios
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseStorage.podspec --use-modular-headers --skip-tests --platforms=tvos
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseStorage.podspec --use-modular-headers --skip-tests --platforms=macos
+
+    - stage: test
+      env:
+        - PROJECT=Functions METHOD=pod-lib-lint
       before_install:
         - ./scripts/if_changed.sh ./scripts/install_prereqs.sh # Start integration test server
       script:
@@ -139,6 +263,9 @@ jobs:
         - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
 
     - stage: test
+      # TODO(paulb777,wilhuff) Replace with a solution that doesn't include multiple platforms in
+      # a single Podfile.
+      osx_image: xcode10.1
       env:
         - PROJECT=Firestore PLATFORM=iOS METHOD=xcodebuild
       before_install:
@@ -148,23 +275,32 @@ jobs:
 
     - stage: test
       env:
-        - PROJECT=GoogleUtilities PLATFORM=iOS METHOD=pod-lib-lint
+        - PROJECT=GoogleUtilities METHOD=pod-lib-lint
       script:
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleUtilities.podspec
 
-    # pod lib lint to check build and warnings for dynamic framework build (use_frameworks!)
+    - stage: test
+      if: type = cron
+      env:
+        - PROJECT=GoogleUtilitiesCron METHOD=pod-lib-lint
+      script:
+
+        - travis_retry ./scripts/pod_lib_lint.rb GoogleUtilities.podspec --use-libraries
+        - travis_retry ./scripts/pod_lib_lint.rb GoogleUtilities.podspec --use-modular-headers
+
     - stage: test
       env:
-        - PROJECT=Firebase PLATFORM=iOS METHOD=pod-lib-lint
+        - PROJECT=Firebase METHOD=pod-lib-lint
       script:
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseAnalyticsInterop.podspec
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseAuthInterop.podspec
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCoreDiagnosticsInterop.podspec
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseInAppMessaging.podspec
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseInAppMessagingDisplay.podspec
 
     - stage: test
       env:
-        - PROJECT=Firestore PLATFORM=iOS METHOD=pod-lib-lint
+        - PROJECT=Firestore METHOD=pod-lib-lint
       script:
         # Eliminate the one warning from BoringSSL when CocoaPods 1.6.0 is available.
         # The travis_wait is necessary because the command takes more than 10 minutes.
@@ -174,100 +310,61 @@ jobs:
     - stage: test
       if: type = cron
       env:
-        - PROJECT=FirebasePllCron1 PLATFORM=iOS METHOD=pod-lib-lint
+        - PROJECT=InAppMessagingCron METHOD=pod-lib-lint
       script:
-        # TODO investigate why macos tests hang for FirebaseAuth - keychain related?
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseAuth.podspec --use-libraries --platforms=ios,tvos
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseAuth.podspec --use-modular-headers --platforms=ios,tvos
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseAuth.podspec --use-libraries --platforms=macos --skip-tests
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseAuth.podspec --use-modular-headers --platforms=macos --skip-tests
-
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseAnalyticsInterop.podspec --use-libraries
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseAnalyticsInterop.podspec --use-modular-headers
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseAuthInterop.podspec --use-libraries
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseAuthInterop.podspec --use-modular-headers
         - travis_retry ./scripts/pod_lib_lint.rb FirebaseInAppMessaging.podspec --use-libraries
         - travis_retry ./scripts/pod_lib_lint.rb FirebaseInAppMessaging.podspec --use-modular-headers
         - travis_retry ./scripts/pod_lib_lint.rb FirebaseInAppMessagingDisplay.podspec --use-libraries
         - travis_retry ./scripts/pod_lib_lint.rb FirebaseInAppMessagingDisplay.podspec --use-modular-headers
 
-    # Part 2: Split from previous stage to avoid overflowing 45 minute sub-job limit.
-    - stage: test
-      if: type = cron
-      env:
-        - PROJECT=FirebasePllCron2 PLATFORM=iOS METHOD=pod-lib-lint
-      script:
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseInstanceID.podspec --use-libraries --platforms=ios
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseInstanceID.podspec --use-libraries --platforms=tvos
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseInstanceID.podspec --use-libraries --platforms=macos
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseInstanceID.podspec --use-modular-headers --platforms=ios
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseInstanceID.podspec --use-modular-headers --platforms=tvos
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseInstanceID.podspec --use-modular-headers --platforms=macos
-
-    # Part 3: Split from previous stage to avoid overflowing 45 minute sub-job limit.
     - stage: test
       if: type = cron
       env:
-        - PROJECT=FirebasePllCron3 PLATFORM=iOS METHOD=pod-lib-lint
+        - PROJECT=Firestore METHOD=pod-lib-lint
       script:
-        # The Protobuf dependency of FirebaseMessaging has warnings with --use-libraries.
-        # FirebaseMessaging includes Swift unit tests so it is not testable with --use-libraries.
-        # TODO(paulb777): Migrate FirebaseMessaging to pod gen driven tests with a separate test
-        # target for Swift.
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseMessaging.podspec --use-libraries --allow-warnings --skip-tests
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseMessaging.podspec --use-modular-headers
-        - travis_retry ./scripts/pod_lib_lint.rb GoogleUtilities.podspec --use-libraries
-        - travis_retry ./scripts/pod_lib_lint.rb GoogleUtilities.podspec --use-modular-headers
+        # TBD - non-portable path warnings
+        # The travis_wait is necessary because the command takes more than 10 minutes.
+        - travis_wait 45 ./scripts/pod_lib_lint.rb FirebaseFirestore.podspec --use-libraries --allow-warnings --no-subspecs
 
     - stage: test
-      if: type = cron
       env:
-        - PROJECT=FirebasePllRemoteConfigCron PLATFORM=iOS METHOD=pod-lib-lint
+        - PROJECT=GoogleDataTransport METHOD=pod-lib-lint
       script:
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --use-libraries --allow-warnings --platforms=ios
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --use-libraries --allow-warnings --platforms=tvos
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --use-libraries --allow-warnings --platforms=macos
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --use-modular-headers --platforms=ios
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --use-modular-headers --platforms=tvos
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseRemoteConfig.podspec --use-modular-headers --platforms=macos
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=ios
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=macos
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=tvos
 
     - stage: test
       if: type = cron
       env:
-        - PROJECT=Firestore PLATFORM=iOS METHOD=pod-lib-lint
-      script:
-        # TBD - non-portable path warnings
-        # The travis_wait is necessary because the command takes more than 10 minutes.
-        - travis_wait 45 ./scripts/pod_lib_lint.rb FirebaseFirestore.podspec --use-libraries --allow-warnings --no-subspecs
-
-    # GoogleDataTransport unit tests and pod linting using the default Xcode version.
-    - stage: test
-      env:
-        - PROJECT=GoogleDataTransport PLATFORM=iOS METHOD=xcodebuild
-      before_install:
-        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+        - PROJECT=GoogleDataTransportCron METHOD=pod-lib-lint
       script:
-        - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=ios --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=macos --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=tvos --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=ios --use-modular-headers
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=macos --use-modular-headers
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=tvos --use-modular-headers
 
-    # GoogleDataTransport integration tests using the default Xcode version.
     - stage: test
       env:
-        - PROJECT=GoogleDataTransportIntegrationTest PLATFORM=iOS METHOD=xcodebuild
-      before_install:
-        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+        - PROJECT=GoogleDataTransportCCTSupport METHOD=pod-lib-lint
       script:
-        - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=ios
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=macos
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=tvos
 
-    # GoogleDataTransportCCTSupport unit tests and pod linting using the default Xcode version.
     - stage: test
+      if: type = cron
       env:
-        - PROJECT=GoogleDataTransportCCTSupport PLATFORM=iOS METHOD=xcodebuild
-      before_install:
-        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+        - PROJECT=GoogleDataTransportCCTSupportCron METHOD=pod-lib-lint
       script:
-        - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
-        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=ios --use-libraries
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=macos --use-libraries
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=tvos --use-libraries
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=ios --use-modular-headers
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=macos --use-modular-headers
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=tvos --use-modular-headers
 
     # Daily test for symbol collisions between Firebase and CocoaPods.
     - stage: test
@@ -298,25 +395,10 @@ jobs:
       script:
         - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM $METHOD
 
-    # Community-supported platforms
-
-    - stage: test
-      env:
-        - PROJECT=Firebase PLATFORM=macOS METHOD=xcodebuild
-      before_install:
-        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
-      script:
-        - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
-
-    - stage: test
-      env:
-        - PROJECT=Firebase PLATFORM=tvOS METHOD=xcodebuild
-      before_install:
-        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
-      script:
-        - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
-
     - stage: test
+      # TODO(paulb777,wilhuff) Replace with a solution that doesn't include multiple platforms in
+      # a single Podfile.
+      osx_image: xcode10.1
       env:
         - PROJECT=Firestore PLATFORM=macOS METHOD=xcodebuild
       before_install:
@@ -325,6 +407,9 @@ jobs:
         - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
 
     - stage: test
+      # TODO(paulb777,wilhuff) Replace with a solution that doesn't include multiple platforms in
+      # a single Podfile.
+      osx_image: xcode10.1
       env:
         - PROJECT=Firestore PLATFORM=tvOS METHOD=xcodebuild
       before_install:
@@ -334,7 +419,10 @@ jobs:
 
     # Firestore sanitizers
 
-    - stage: test
+    - stage:
+      # TODO(paulb777,wilhuff) Replace with a solution that doesn't include multiple platforms in
+      # a single Podfile.
+      osx_image: xcode10.1
       env:
         - PROJECT=Firestore PLATFORM=iOS METHOD=xcodebuild SANITIZERS=asan
       before_install:
@@ -343,6 +431,9 @@ jobs:
         - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM $METHOD
 
     - stage: test
+      # TODO(paulb777,wilhuff) Replace with a solution that doesn't include multiple platforms in
+      # a single Podfile.
+      osx_image: xcode10.1
       env:
         - PROJECT=Firestore PLATFORM=iOS METHOD=xcodebuild SANITIZERS=tsan
       before_install:

Example/CoreDiagnostics/Tests/FIRCoreDiagnosticsTest.m

@@ -153,7 +153,8 @@ extern void FIRPopulateProtoWithInfoPlistValues(
 }
 
 /** Tests populating the proto correctly. */
-- (void)testProtoPopulation {
+// https://github.com/firebase/firebase-ios-sdk/issues/3711
+- (void)SKIPtestProtoPopulation {
   logs_proto_mobilesdk_ios_ICoreConfiguration icoreConfiguration =
       logs_proto_mobilesdk_ios_ICoreConfiguration_init_default;
   FIRPopulateProtoWithCommonInfoFromApp(&icoreConfiguration, @{

Example/Podfile

@@ -148,131 +148,3 @@ target 'Auth_Sample' do
     pod 'EarlGrey'
   end
 end
-
-target 'Core_Example_macOS' do
-  platform :osx, '10.11'
-
-  pod 'FirebaseCore', :path => '../'
-  pod 'FirebaseCoreDiagnostics', :path => '../'
-  pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
-  pod 'GoogleDataTransport', :path => '../'
-  pod 'GoogleDataTransportCCTSupport', :path => '../'
-
-  target 'Core_Tests_macOS' do
-    inherit! :search_paths
-    pod 'OCMock'
-  end
-end
-
-target 'Auth_Example_macOS' do
-  platform :osx, '10.11'
-
-  pod 'FirebaseAuth', :path => '../'
-
-  target 'Auth_Tests_macOS' do
-    inherit! :search_paths
-    pod 'OCMock'
-  end
-end
-
-target 'Database_Example_macOS' do
-  platform :osx, '10.11'
-
-  pod 'FirebaseDatabase', :path => '../'
-
-  target 'Database_Tests_macOS' do
-    inherit! :search_paths
-  end
-
-  target 'Database_IntegrationTests_macOS' do
-    inherit! :search_paths
-  end
-end
-
-target 'Storage_Example_macOS' do
-  platform :osx, '10.11'
-
-  pod 'FirebaseStorage', :path => '../'
-
-  target 'Storage_Tests_macOS' do
-    inherit! :search_paths
-    pod 'OCMock'
-  end
-
-  target 'Storage_IntegrationTests_macOS' do
-    inherit! :search_paths
-  end
-end
-
-target 'Core_Example_tvOS' do
-  platform :tvos, '10.0'
-
-  target 'Core_Tests_tvOS' do
-    inherit! :search_paths
-    pod 'OCMock'
-  end
-end
-
-target 'Auth_Example_tvOS' do
-  platform :tvos, '10.0'
-
-  pod 'FirebaseAuth', :path => '../'
-
-  target 'Auth_Tests_tvOS' do
-    inherit! :search_paths
-    pod 'OCMock'
-  end
-end
-
-target 'Database_Example_tvOS' do
-  platform :tvos, '10.0'
-
-  pod 'FirebaseDatabase', :path => '../'
-
-  target 'Database_Tests_tvOS' do
-    inherit! :search_paths
-  end
-
-# TODO
-# target 'Database_IntegrationTests_tvOS' do
-#    inherit! :search_paths
-#  end
-end
-
-target 'Storage_Example_tvOS' do
-  platform :tvos, '10.0'
-
-  pod 'FirebaseStorage', :path => '../'
-
-  target 'Storage_Tests_tvOS' do
-    inherit! :search_paths
-    pod 'OCMock'
-  end
-
-#TODO Storage_IntegrationTests_tvOS
-#  target 'Storage_IntegrationTests_tvOS' do
-#    inherit! :search_paths
-#  end
-end
-
-target 'Messaging_Example_tvOS' do
-  platform :tvos, '10.0'
-
-  pod 'FirebaseMessaging', :path => '../'
-
-  target 'Messaging_Tests_tvOS' do
-    inherit! :search_paths
-    pod 'OCMock'
-  end
-end
-
-target 'InstanceID_Example_tvOS' do
-  platform :tvos, '10.0'
-
-  pod 'FirebaseInstanceID', :path => '../'
-
-  target 'InstanceID_Tests_tvOS' do
-    inherit! :search_paths
-    pod 'OCMock'
-  end
-end

Gemfile

@@ -3,4 +3,6 @@
 source 'https://rubygems.org'
 
 gem 'cocoapods', "1.7.5"
-gem 'cocoapods-generate', "1.5.0"
+# TODO(paulb777): The GitHub install is needed for the --platforms feature.
+# Change it back to a version specification when the 1.6.0 gem publishes.
+gem 'cocoapods-generate', :git => 'https://github.com/square/cocoapods-generate.git', :ref => 'ada3b8f'

Gemfile.lock

@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/square/cocoapods-generate.git
+  revision: ada3b8f1b76248ed4b3ac9cd3a4d8b0e281f2b7a
+  ref: ada3b8f
+  specs:
+    cocoapods-generate (1.5.0)
+      cocoapods-disable-podfile-validations (~> 0.1.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -35,8 +43,6 @@ GEM
     cocoapods-deintegrate (1.0.4)
     cocoapods-disable-podfile-validations (0.1.1)
     cocoapods-downloader (1.2.2)
-    cocoapods-generate (1.5.0)
-      cocoapods-disable-podfile-validations (~> 0.1.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
@@ -74,7 +80,7 @@ PLATFORMS
 
 DEPENDENCIES
   cocoapods (= 1.7.5)
-  cocoapods-generate (= 1.5.0)
+  cocoapods-generate!
 
 BUNDLED WITH
    1.17.3

scripts/build.sh

@@ -18,6 +18,11 @@
 #
 # Builds the given product for the given platform using the given build method
 
+function pod_gen() {
+  # Call pod gen with a podspec and additional optional arguments.
+  bundle exec pod gen --local-sources=./ --sources=https://cdn.cocoapods.org/ "$@"
+}
+
 set -euo pipefail
 
 if [[ $# -lt 1 ]]; then
@@ -193,13 +198,6 @@ case "$product-$method-$platform" in
         build \
         test
 
-    RunXcodebuild \
-        -workspace 'GoogleUtilities/Example/GoogleUtilities.xcworkspace' \
-        -scheme "Example_$platform" \
-        "${xcb_flags[@]}" \
-        build \
-        test
-
     if [[ $platform == 'iOS' ]]; then
       # Code Coverage collection is only working on iOS currently.
       ./scripts/collect_metrics.sh 'Example/Firebase.xcworkspace' "AllUnitTests_$platform"
@@ -332,94 +330,41 @@ case "$product-$method-$platform" in
         build
     ;;
 
-  GoogleDataTransport-xcodebuild-*)
-    RunXcodebuild \
-        -workspace 'gen/GoogleDataTransport/GoogleDataTransport.xcworkspace' \
-        -scheme "GoogleDataTransport-$platform-Unit-Tests-Unit" \
-        "${xcb_flags[@]}" \
-        build \
-        test
-
-    RunXcodebuild \
-        -workspace 'gen/GoogleDataTransport/GoogleDataTransport.xcworkspace' \
-        -scheme "GoogleDataTransport-$platform-Unit-Tests-Lifecycle" \
-        "${xcb_flags[@]}" \
-        build \
-        test
-    ;;
-
-  GoogleDataTransportIntegrationTest-xcodebuild-*)
-    RunXcodebuild \
-        -workspace 'gen/GoogleDataTransport/GoogleDataTransport.xcworkspace' \
-        -scheme "GoogleDataTransport-$platform-Unit-Tests-Integration" \
-        "${xcb_flags[@]}" \
-        build \
-        test
-    ;;
-
-  GoogleDataTransportCCTSupport-xcodebuild-*)
-    RunXcodebuild \
-        -workspace 'gen/GoogleDataTransportCCTSupport/GoogleDataTransportCCTSupport.xcworkspace' \
-        -scheme "GoogleDataTransportCCTSupport-$platform-Unit-Tests-Unit" \
-        "${xcb_flags[@]}" \
-        build \
-        test
-
-    RunXcodebuild \
-        -workspace 'gen/GoogleDataTransportCCTSupport/GoogleDataTransportCCTSupport.xcworkspace' \
-        -scheme "GoogleDataTransportCCTSupport-$platform-Unit-Tests-Integration" \
-        "${xcb_flags[@]}" \
-        build \
-        test
-    ;;
-
   Database-xcodebuild-*)
+    pod_gen FirebaseDatabase.podspec --platforms=ios
     RunXcodebuild \
       -workspace 'gen/FirebaseDatabase/FirebaseDatabase.xcworkspace' \
-      -scheme "FirebaseDatabase-iOS-Unit-unit" \
+      -scheme "FirebaseDatabase-Unit-unit" \
       "${ios_flags[@]}" \
       "${xcb_flags[@]}" \
       build \
       test
-    RunXcodebuild \
-      -workspace 'gen/FirebaseDatabase/FirebaseDatabase.xcworkspace' \
-      -scheme "FirebaseDatabase-macOS-Unit-unit" \
-      "${macos_flags[@]}" \
-      "${xcb_flags[@]}" \
-      build \
-      test
-    RunXcodebuild \
-      -workspace 'gen/FirebaseDatabase/FirebaseDatabase.xcworkspace' \
-      -scheme "FirebaseDatabase-tvOS-Unit-unit" \
-      "${tvos_flags[@]}" \
-      "${xcb_flags[@]}" \
-      build \
-      test
 
     if [[ "$TRAVIS_PULL_REQUEST" == "false" ||
           "$TRAVIS_PULL_REQUEST_SLUG" == "$TRAVIS_REPO_SLUG" ]]; then
       # Integration tests are only run on iOS to minimize flake failures.
       RunXcodebuild \
         -workspace 'gen/FirebaseDatabase/FirebaseDatabase.xcworkspace' \
-        -scheme "FirebaseDatabase-iOS-Unit-integration" \
+        -scheme "FirebaseDatabase-Unit-integration" \
         "${ios_flags[@]}" \
         "${xcb_flags[@]}" \
         build \
         test
       fi
-    ;;
 
-  Messaging-xcodebuild-*)
+    pod_gen FirebaseDatabase.podspec --platforms=macos --clean
     RunXcodebuild \
-      -workspace 'gen/FirebaseMessaging/FirebaseMessaging.xcworkspace' \
-      -scheme "FirebaseMessaging-iOS-Unit-unit" \
-      "${ios_flags[@]}" \
+      -workspace 'gen/FirebaseDatabase/FirebaseDatabase.xcworkspace' \
+      -scheme "FirebaseDatabase-Unit-unit" \
+      "${macos_flags[@]}" \
       "${xcb_flags[@]}" \
       build \
       test
+
+    pod_gen FirebaseDatabase.podspec --platforms=tvos --clean
     RunXcodebuild \
-      -workspace 'gen/FirebaseMessaging/FirebaseMessaging.xcworkspace' \
-      -scheme "FirebaseMessaging-tvOS-Unit-unit" \
+      -workspace 'gen/FirebaseDatabase/FirebaseDatabase.xcworkspace' \
+      -scheme "FirebaseDatabase-Unit-unit" \
       "${tvos_flags[@]}" \
       "${xcb_flags[@]}" \
       build \
@@ -427,39 +372,44 @@ case "$product-$method-$platform" in
     ;;
 
   Storage-xcodebuild-*)
+    pod_gen FirebaseStorage.podspec --platforms=ios
     RunXcodebuild \
       -workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
-      -scheme "FirebaseStorage-iOS-Unit-unit" \
+      -scheme "FirebaseStorage-Unit-unit" \
       "${ios_flags[@]}" \
       "${xcb_flags[@]}" \
       build \
       test
+
+    if [[ "$TRAVIS_PULL_REQUEST" == "false" ||
+          "$TRAVIS_PULL_REQUEST_SLUG" == "$TRAVIS_REPO_SLUG" ]]; then
+      # Integration tests are only run on iOS to minimize flake failures.
+      RunXcodebuild \
+        -workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
+        -scheme "FirebaseStorage-Unit-integration" \
+        "${ios_flags[@]}" \
+        "${xcb_flags[@]}" \
+        build \
+        test
+      fi
+
+    pod_gen FirebaseStorage.podspec --platforms=macos --clean
     RunXcodebuild \
       -workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
-      -scheme "FirebaseStorage-macOS-Unit-unit" \
+      -scheme "FirebaseStorage-Unit-unit" \
       "${macos_flags[@]}" \
       "${xcb_flags[@]}" \
       build \
       test
+
+    pod_gen FirebaseStorage.podspec --platforms=tvos --clean
     RunXcodebuild \
       -workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
-      -scheme "FirebaseStorage-tvOS-Unit-unit" \
+      -scheme "FirebaseStorage-Unit-unit" \
       "${tvos_flags[@]}" \
       "${xcb_flags[@]}" \
       build \
       test
-
-    if [[ "$TRAVIS_PULL_REQUEST" == "false" ||
-          "$TRAVIS_PULL_REQUEST_SLUG" == "$TRAVIS_REPO_SLUG" ]]; then
-      # Integration tests are only run on iOS to minimize flake failures.
-      RunXcodebuild \
-        -workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
-        -scheme "FirebaseStorage-iOS-Unit-integration" \
-        "${ios_flags[@]}" \
-        "${xcb_flags[@]}" \
-        build \
-        test
-      fi
     ;;
   *)
     echo "Don't know how to build this product-platform-method combination" 1>&2

scripts/if_changed.sh

@@ -78,6 +78,11 @@ else
       check_changes '^(Firebase/Core|Firebase/Auth|Example/Auth|GoogleUtilities|FirebaseAuth.podspec)'
       ;;
 
+    CoreDiagnostics-*)
+      check_changes '^(Firebase/CoreDiagnostics|Example/CoreDiagnostics/Tests|FirebaseCoreDiagnostics.podspec|'\
+'FirebaseCoreDiagnosticsInterop|FirebaseCoreDiagnosticsInterop.podspec)'
+      ;;
+
     Database-*)
       check_changes '^(Firebase/Core|Firebase/Database|Example/Database|GoogleUtilities|FirebaseDatabase.podspec)'
       ;;
@@ -113,11 +118,6 @@ else
       check_changes '^(Firestore/(core|third_party)|cmake|GoogleUtilities)'
       ;;
 
-    FirebaseCoreDiagnostics-*)
-      check_changes '^(Firebase/CoreDiagnostics|FirebaseCoreDiagnosticsInterop|'\
-'FirebaseCoreDiagnostics.podspec|FirebaseCoreDiagnosticsInterop.podspec)'
-      ;;
-
     GoogleDataTransport-*)
       check_changes '^(GoogleDataTransport|GoogleDataTransport.podspec)'
       ;;

scripts/install_prereqs.sh

@@ -51,17 +51,10 @@ function install_secrets() {
   fi
 }
 
-function pod_gen() {
-  # Call pod gen with a podspec and additonal optional arguments.
-  bundle exec pod gen --local-sources=./ --sources=https://cdn.cocoapods.org/ "$@"
-}
-
 case "$PROJECT-$PLATFORM-$METHOD" in
   Firebase-iOS-xcodebuild)
     gem install xcpretty
     bundle exec pod install --project-directory=Example --repo-update
-    bundle exec pod install --project-directory=Functions/Example
-    bundle exec pod install --project-directory=GoogleUtilities/Example
     install_secrets
     ;;
 
@@ -79,9 +72,6 @@ case "$PROJECT-$PLATFORM-$METHOD" in
     ;;
 
   Database-*)
-    # Install the workspace to have better control over test runs than
-    # pod lib lint, since the integration tests can be flaky.
-    pod_gen FirebaseDatabase.podspec
     install_secrets
     ;;
 
@@ -90,16 +80,7 @@ case "$PROJECT-$PLATFORM-$METHOD" in
     ./Functions/Backend/start.sh synchronous
     ;;
 
-  Messaging-*)
-    # Install the workspace to have better control over test runs than
-    # pod lib lint, since the integration tests can be flaky.
-    pod_gen FirebaseMessaging.podspec
-    ;;
-
   Storage-*)
-    # Install the workspace to have better control over test runs than
-    # pod lib lint, since the integration tests can be flaky.
-    pod_gen FirebaseStorage.podspec
     install_secrets
     ;;
 
@@ -146,25 +127,6 @@ case "$PROJECT-$PLATFORM-$METHOD" in
     bundle exec pod install --project-directory=SymbolCollisionTest --repo-update
     ;;
 
-  FirebaseCoreDiagnostics-*-xcodebuild)
-    gem install xcpretty
-    pod_gen FirebaseCoreDiagnostics.podspec
-    ;;
-
-  GoogleDataTransport-*-xcodebuild)
-    gem install xcpretty
-    pod_gen GoogleDataTransport.podspec
-    ;;
-
-  GoogleDataTransportIntegrationTest-*-xcodebuild)
-    gem install xcpretty
-    pod_gen GoogleDataTransport.podspec
-    ;;
-
-  GoogleDataTransportCCTSupport-*-xcodebuild)
-    gem install xcpretty
-    pod_gen GoogleDataTransportCCTSupport.podspec
-    ;;
   *)
     echo "Unknown project-platform-method combo" 1>&2
     echo "  PROJECT=$PROJECT" 1>&2