Test against Ruby 2.6 and RubyGems 3

4 files changed, 22 insertions, 10 deletions

diff --git a/.travis.yml b/.travis.yml
index 846ff33746..02c60d693c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,8 @@ addons:
       secure: "TrzIv116JLGUxm6PAUskCYrv8KTDguncKROVwbnjVPKTGDAgoDderd8JUdDEXrKoZ9qGLD2TPYKExt9/QDl71E+qHdWnVqWv4HKCUk2P9z/VLKzHuggOUBkCXiJUhjywUieCJhI3N92bfq2EjSBbu2/OFHqWOjLQ+QCooTEBjv8="
 
 rvm:
-  - 2.5.2
+  - 2.6.0
+  - 2.5.3
   - 2.4.5
   - 2.3.8
 
@@ -41,17 +42,24 @@ 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.7.7
+  - RGV=v3.0.1
 
 jobs:
   include:
-    - rvm: 2.5
+    - rvm: 2.6.0
       script: rake rubocop
       stage: linting
+    # Ruby 2.5, Rubygems 2.7 and up
+    - rvm: 2.5.3
+      env: RGV=v2.7.7
+      stage: test
     # Ruby 2.4, Rubygems 2.6 and up
-    - rvm: 2.4.2
+    - rvm: 2.4.5
       env: RGV=v2.6.14
       stage: test
+    - rvm: 2.4.5
+      env: RGV=v2.7.7
+      stage: test
     # Ruby 2.3, Rubygems 2.5 and up
     - rvm: 2.3.7
       env: RGV=v2.5.2
@@ -59,12 +67,15 @@ jobs:
     - rvm: 2.3.7
       env: RGV=v2.6.14
       stage: test
+    - rvm: 2.3.7
+      env: RGV=v2.7.7
+      stage: test
     # Ruby-head (we want to know how we're doing, but not fail the build)
     - rvm: ruby-head
       env: RGV=master
       stage: test
     # 1.x mode (we want to keep stuff passing in 1.x mode for now)
-    - rvm: 2.5.1
+    - rvm: 2.6.0
       env: RGV=v2.7.7 BUNDLER_SPEC_SUB_VERSION=1.98
       stage: test
     - rvm: 1.8.7
diff --git a/Rakefile b/Rakefile
index 6a5ce7d327..746d110f86 100644
--- a/Rakefile
+++ b/Rakefile
@@ -141,7 +141,7 @@ begin
       rubyopt = ENV["RUBYOPT"]
       # When editing this list, also edit .travis.yml!
       branches = %w[master]
-      releases = %w[v2.5.2 v2.6.14 v2.7.7]
+      releases = %w[v2.5.2 v2.6.14 v2.7.7 v3.0.1]
       (branches + releases).each do |rg|
         desc "Run specs with RubyGems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
diff --git a/lib/bundler/current_ruby.rb b/lib/bundler/current_ruby.rb
index d5efaad6c5..ae5fae841e 100644
--- a/lib/bundler/current_ruby.rb
+++ b/lib/bundler/current_ruby.rb
@@ -19,6 +19,7 @@ module Bundler
       2.4
       2.5
       2.6
+      2.7
     ].freeze
 
     KNOWN_MAJOR_VERSIONS = KNOWN_MINOR_VERSIONS.map {|v| v.split(".", 2).first }.uniq.freeze
diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn
index f4772f6d8d..c941463edc 100644
--- a/man/gemfile.5.ronn
+++ b/man/gemfile.5.ronn
@@ -216,13 +216,13 @@ used on platforms with Ruby 2.3, use:
 The full list of platforms and supported versions includes:
 
   * `ruby`:
-    1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
+    1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
   * `mri`:
-    1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
+    1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
   * `mingw`:
-    1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
+    1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
   * `x64_mingw`:
-    2.0, 2.1, 2.2, 2.3, 2.4, 2.5
+    2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
 
 As with groups, you can specify one or more platforms: