update travis build files

 - add new rubygems 2.5.0
 - update rubygems 2.2.3 to 2.2.5
 - remove rbx-2, it has never passed
 - stop testing Ruby 1.9.2, it’s unused enough now

2 files changed, 7 insertions, 14 deletions

diff --git a/.travis.yml b/.travis.yml
index 8391a312d4..bc94d34c58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,6 @@ rvm:
   - 2.0.0
   - 1.9.3
   - 1.8.7
-  - rbx-2
 
 # Rubygems versions MUST be available as rake tasks
 # see Rakefile:66 for the list of possible RGV values
@@ -34,24 +33,25 @@ env:
   # We need to know if changes to rubygems will break bundler on release
   - RGV=master
   # Test the latest rubygems release with all of our supported rubies
+  - RGV=v2.5.0
   - RGV=v2.4.8
 
 matrix:
   include:
-    # Ruby 2.2, Rubygems 2.4.5 and up (RG 2.4 is included by the matrix above)
+    # Ruby 2.2, Rubygems 2.4.5 and up (included by RGV above)
     # Ruby 2.1, Rubygems 2.2.2 and up
     - rvm: 2.1
-      env: RGV=v2.2.3
+      env: RGV=v2.2.5
     # Ruby 2.0.0, Rubygems 2.0.0 and up
     - rvm: 2.0.0
-      env: RGV=v2.2.3
+      env: RGV=v2.2.5
     - rvm: 2.0.0
       env: RGV=v2.1.11
     - rvm: 2.0.0
       env: RGV=v2.0.14
     # Ruby 1.9.3, Rubygems 1.5.3 and up
     - rvm: 1.9.3
-      env: RGV=v2.2.3
+      env: RGV=v2.2.5
     - rvm: 1.9.3
       env: RGV=v2.1.11
     - rvm: 1.9.3
@@ -66,7 +66,7 @@ matrix:
       env: RGV=v1.5.3
     # Ruby 1.8.7, Rubygems 1.3.6 and up
     - rvm: 1.8.7
-      env: RGV=v2.2.3
+      env: RGV=v2.2.5
     - rvm: 1.8.7
       env: RGV=v2.0.14
     - rvm: 1.8.7
@@ -88,17 +88,10 @@ matrix:
     # For no apparent reason, this often goes over the Travis limit
     - rvm: 1.8.7
       env: RGV=v2.1.11
-    # Ruby 1.9.2 sanity check
-    # (but it's just too slow and sometimes goes over the Travis limit)
-    - rvm: 1.9.2
-      env: RGV=v2.4.8
     # Ruby-head (we want to know how we're doing, but not fail the build)
     - rvm: ruby-head
       env: RGV=master
   allow_failures:
     - rvm: 1.8.7
       env: RGV=v2.1.11
-    - rvm: 1.9.2
     - rvm: ruby-head
-    - rvm: jruby
-    - rvm: rbx-2
diff --git a/Rakefile b/Rakefile
index 745adfb5b4..b64f738757 100644
--- a/Rakefile
+++ b/Rakefile
@@ -122,7 +122,7 @@ begin
       rubyopt = ENV["RUBYOPT"]
       # When editing this list, also edit .travis.yml!
       branches = %w(master)
-      releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.3 v2.4.8)
+      releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.5 v2.4.8 v2.5.0)
       (branches + releases).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|