From 2154d116c3cfd34baac1366cf4f5b77a6e568c55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Wed, 9 May 2018 15:28:12 -0300
Subject: [PATCH] Bump versions tested on TravisCI (#1566)

* Bump versions tested on TravisCI

* Remove apparently unused stuff

* Workaround for 2.5.1 Travis/Bundler issue

* Remove no longer needed workaround

* Jruby 9.1.17.0 is out!
---
 .rubocop.yml   |  1 -
 .travis.yml    | 15 +++++++--------
 Gemfile        |  2 +-
 README.md      |  4 ++--
 test/helper.rb |  2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index dbd1ee87..3e2f35dc 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -5,7 +5,6 @@ AllCops:
   StyleGuideCopsOnly: false
   Exclude:
     - 'tmp/**/*'
-    - 'gemfiles/vendor/**/*'
     - 'vendor/**/*'
     - 'Rakefile'
 
diff --git a/.travis.yml b/.travis.yml
index 59893c79..8d22e03d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,19 +4,18 @@ group: beta
 language: ruby
 cache: bundler
 before_install:
-  # bundler installation needed for jruby-head
-  # https://github.com/travis-ci/travis-ci/issues/5861
-  - gem update --system
+  # https://github.com/travis-ci/travis-ci/issues/9383#issuecomment-377680108
+  - gem install bundler
 branches:
   only:
     - "master"
 rvm:
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
   - ruby-head
-  - jruby-9.1.15.0
+  - jruby-9.1.17.0
   - jruby-head
   - rbx-3
 matrix:
diff --git a/Gemfile b/Gemfile
index 8dc1f79b..38b11041 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,6 +13,6 @@ gem "jruby-openssl", :platform => "jruby"
 
 gem "rubocop", "~> 0.50.0"
 
-if %w(2.2.7 2.2.8 2.2.9 2.3.4 2.4.1).include? RUBY_VERSION
+if %w(2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1).include? RUBY_VERSION
   gem "stopgap_13632", "~> 1.0", :platforms => ["mri", "mingw", "x64_mingw"]
 end
diff --git a/README.md b/README.md
index 6c1d0ac4..9b8dfd73 100644
--- a/README.md
+++ b/README.md
@@ -217,10 +217,10 @@ Some platforms do not support all Puma features.
 
 ## Known Bugs
 
-For MRI versions 2.2.7, 2.2.8, 2.2.9, 2.3.4 and 2.4.1, you may see ```stream closed in another thread (IOError)```. It may be caused by a [Ruby bug](https://bugs.ruby-lang.org/issues/13632). It can be fixed with the gem https://rubygems.org/gems/stopgap_13632:
+For MRI versions 2.2.7, 2.2.8, 2.2.9, 2.2.10 2.3.4 and 2.4.1, you may see ```stream closed in another thread (IOError)```. It may be caused by a [Ruby bug](https://bugs.ruby-lang.org/issues/13632). It can be fixed with the gem https://rubygems.org/gems/stopgap_13632:
 
 ```ruby
-if %w(2.2.7 2.2.8 2.2.9 2.3.4 2.4.1).include? RUBY_VERSION
+if %w(2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1).include? RUBY_VERSION
   begin
     require 'stopgap_13632'
   rescue LoadError
diff --git a/test/helper.rb b/test/helper.rb
index d0fe7816..ff3b6754 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,7 +1,7 @@
 # Copyright (c) 2011 Evan Phoenix
 # Copyright (c) 2005 Zed A. Shaw
 
-if %w(2.2.7 2.2.8 2.2.9 2.3.4 2.4.1).include? RUBY_VERSION
+if %w(2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1).include? RUBY_VERSION
   begin
     require 'stopgap_13632'
   rescue LoadError