CocoaPods CI update

.travis.yml

@@ -239,54 +239,24 @@ jobs:
 
     # Validate Cocoapods configurations
     # This may take long time, so we would like to run it only once all other tests pass
-    # Validate Cocoapods 1.7.0 compatibility
     - stage: test
       if: type = cron
       env:
-        - POD_CONFIG_DIR=Cocoapods1_7_0_multiprojects_frameworks
+        - POD_CONFIG_DIR=Cocoapods_multiprojects_frameworks
       script:
         - travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
 
     - stage: test
       if: type = cron
       env:
-        - POD_CONFIG_DIR=Cocoapods1_7_0_frameworks
-      script:
-        - travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
-
-    - stage: test
-      if: type = cron
-      env:
-        - POD_CONFIG_DIR=Cocoapods1_7_0_multiprojects_staticLibs
-      script:
-        - travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
-
-    - stage: test
-      if: type = cron
-      env:
-        - POD_CONFIG_DIR=Cocoapods1_7_0_staticLibs
-      script:
-        - travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
-
-    # Validate Cocoapods 1.6.1 compatibility
-    - stage: test
-      if: type = cron
-      env:
-        - POD_CONFIG_DIR=Cocoapods1_6_1_frameworks
-      script:
-        - travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
-
-    - stage: test
-      if: type = cron
-      env:
-        - POD_CONFIG_DIR=Cocoapods1_6_1_staticLibs
+        - POD_CONFIG_DIR=Cocoapods_multiprojects_staticLibs
       script:
         - travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
 
   allow_failures:
     # Run fuzz tests only on cron jobs.
     - stage: test
-      if: type = cron
+#      if: type = cron
       env:
         - PROJECT=Firestore PLATFORM=iOS METHOD=fuzz
       before_install:

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Gemfile → CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile

@@ -2,4 +2,4 @@
 
 source "https://rubygems.org"
 
-gem 'cocoapods', "=1.6.1"
+gem 'cocoapods', '1.10.0.rc.1'

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_staticLibs/Gemfile → CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_staticLibs/Gemfile

@@ -3,4 +3,4 @@
 source "https://rubygems.org"
 
 # Don't allow 1.7.0.rc.1 because of https://github.com/CocoaPods/CocoaPods/issues/8765
-gem 'cocoapods', "!=1.7.0.rc.1"
+gem 'cocoapods', '1.10.0.rc.1'