Merge pull request #2475 from sergiocampama/rvm2

Reenable cocoapods objc test and remove unnecessary workaround for rvm

.travis.yml

@@ -73,10 +73,6 @@ matrix:
     # we moved to an OS X image that is 10.11.
     - os: osx
       env: CONFIG=python_cpp
-    # This started failing with the OS X 10.12 / Xcode 8.1 image.
-    # https://github.com/google/protobuf/issues/2472
-    - os: osx
-      env: CONFIG=objectivec_cocoapods_integration
     # Mark the iOS test as flakey as xcodebuild some times fails to start the
     # iOS Simulator.
     - os: osx

tests.sh

@@ -275,15 +275,6 @@ build_objectivec_osx() {
 }
 
 build_objectivec_cocoapods_integration() {
-  # First, load the RVM environment in bash, needed to update ruby.
-  source ~/.rvm/scripts/rvm
-  # Update rvm to the latest version. This is needed to solve
-  # https://github.com/google/protobuf/issues/1786 and may not be needed in the
-  # future when Travis updates the default version of rvm.
-  rvm get head
-  # Update ruby to 2.2.3 as the default one crashes with segmentation faults
-  # when using pod.
-  rvm use 2.2.3 --install --binary --fuzzy
   # Update pod to the latest version.
   gem install cocoapods --no-ri --no-rdoc
   objectivec/Tests/CocoaPods/run_tests.sh