Travis: add 2.6.0 to CI matrix, remove sudo: false (#839)

.travis.yml

@@ -1,22 +1,28 @@
-sudo: false
 language: ruby
 script: bundle exec script/test
-cache: bundler
 
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5.0
+  - 2.1.10
+  - 2.2.10
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
   - ruby-head
   - jruby-19mode
   - jruby-20mode
   - jruby-21mode
   - jruby-head
 
+before_install:
+  - |
+    export RVM_CURRENT=`rvm current|cut -c6-8`
+    if [ "${RVM_CURRENT}" == "2.2" ]; then
+      gem install bundler -v '< 2'
+    fi
+
 matrix:
   allow_failures:
     # "A fatal error has been detected by the Java Runtime Environment:
@@ -42,6 +48,6 @@ deploy:
   on:
     tags: true
     repo: lostisland/faraday
-    rvm: 2.4
+    rvm: 2.4.5
     condition: '"$SSL" = "yes"'
 

Gemfile

@@ -4,7 +4,16 @@ ruby RUBY_VERSION
 
 gem 'ffi-ncurses', '~> 0.3', :platforms => :jruby
 gem 'jruby-openssl', '~> 0.8.8', :platforms => :jruby
-gem 'rake'
+if RUBY_VERSION > '2'
+  gem 'net-http-persistent', group: :test
+  gem 'rake'
+  gem 'tins'
+else
+  gem 'net-http-persistent', '< 3.0', group: :test
+  gem 'rake', '= 12.2.1'
+  gem 'tins', '= 1.6.0'
+end
+
 
 group :test do
   gem 'coveralls', :require => false
@@ -15,7 +24,6 @@ group :test do
   gem 'httpclient', '>= 2.2'
   gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
   gem 'minitest', '>= 5.0.5'
-  gem 'net-http-persistent'
   gem 'patron', '>= 0.4.2', :platforms => :ruby
   gem 'rack-test', '>= 0.6', :require => 'rack/test'
   gem 'rest-client', '~> 1.6.0', :platforms => [:jruby, :ruby_18]