firebase
diff --git a/‎.travis.yml
Lines changed: 3 additions & 33 deletions b/‎.travis.yml
Lines changed: 3 additions & 33 deletions
diff --git a/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Podfile
Lines changed: 0 additions & 24 deletions b/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Podfile
Lines changed: 0 additions & 24 deletions
diff --git a/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Gemfile
Lines changed: 0 additions & 5 deletions b/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Gemfile
Lines changed: 0 additions & 5 deletions
diff --git a/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Podfile
Lines changed: 0 additions & 22 deletions b/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Podfile
Lines changed: 0 additions & 22 deletions
diff --git a/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Gemfile
Lines changed: 0 additions & 5 deletions b/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Gemfile
Lines changed: 0 additions & 5 deletions
diff --git a/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Podfile
Lines changed: 0 additions & 23 deletions b/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Podfile
Lines changed: 0 additions & 23 deletions
diff --git a/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_frameworks/Gemfile
Lines changed: 0 additions & 5 deletions b/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_frameworks/Gemfile
Lines changed: 0 additions & 5 deletions
diff --git a/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Gemfile
Lines changed: 0 additions & 6 deletions b/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Gemfile
Lines changed: 0 additions & 6 deletions
diff --git a/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Podfile
Lines changed: 0 additions & 22 deletions b/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Podfile
Lines changed: 0 additions & 22 deletions
diff --git a/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Gemfile renamed to ‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile
Lines changed: 1 addition & 1 deletion b/‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Gemfile renamed to ‎CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile
Lines changed: 1 addition & 1 deletion
@@ -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:
 
@@ -2,4 +2,4 @@
 
 source "https://rubygems.org"
 
-gem 'cocoapods', "=1.6.1"
+gem 'cocoapods', '1.10.0.rc.1'
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`source "https://rubygems.org"`
`4`	`4`
`5`		`-gem 'cocoapods', "=1.6.1"`
	`5`	`+gem 'cocoapods', '1.10.0.rc.1'`