From c8d8065494652869343aa06852b6788d33d902bc Mon Sep 17 00:00:00 2001
From: Samuel Giddins <segiddins@segiddins.me>
Date: Tue, 26 Dec 2017 10:47:20 +0700
Subject: [PATCH 1/4] [Travis] Test against Ruby 2.5

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 8931bcced78..815ed26108a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,7 @@ addons:
       secure: "TrzIv116JLGUxm6PAUskCYrv8KTDguncKROVwbnjVPKTGDAgoDderd8JUdDEXrKoZ9qGLD2TPYKExt9/QDl71E+qHdWnVqWv4HKCUk2P9z/VLKzHuggOUBkCXiJUhjywUieCJhI3N92bfq2EjSBbu2/OFHqWOjLQ+QCooTEBjv8="
 
 rvm:
+  - 2.5.0
   - 2.4.2
   - 2.3.5
 

From 9022a09f3f76f79ac8c0068443c5e5249029b522 Mon Sep 17 00:00:00 2001
From: Samuel Giddins <segiddins@segiddins.me>
Date: Tue, 26 Dec 2017 10:48:47 +0700
Subject: [PATCH 2/4] [CurrentRuby] Add 2.6 as a known minor

See https://github.com/ruby/ruby/commit/0af050993e9cc55e2f58d8f4677c1521bacf5bea
---
 lib/bundler/current_ruby.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/bundler/current_ruby.rb b/lib/bundler/current_ruby.rb
index 31532d108df..220d638b87f 100644
--- a/lib/bundler/current_ruby.rb
+++ b/lib/bundler/current_ruby.rb
@@ -18,6 +18,7 @@ class CurrentRuby
       2.3
       2.4
       2.5
+      2.6
     ].freeze
 
     KNOWN_MAJOR_VERSIONS = KNOWN_MINOR_VERSIONS.map {|v| v.split(".", 2).first }.uniq.freeze

From 7a66b8d837471afb84781253157ebd7d94442883 Mon Sep 17 00:00:00 2001
From: Samuel Giddins <segiddins@segiddins.me>
Date: Tue, 26 Dec 2017 10:49:59 +0700
Subject: [PATCH 3/4] [Travis] Test against latest ruby versions

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 815ed26108a..582eb56c09f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,8 +27,8 @@ addons:
 
 rvm:
   - 2.5.0
-  - 2.4.2
-  - 2.3.5
+  - 2.4.3
+  - 2.3.6
 
 # Rubygems versions MUST be available as rake tasks
 # see Rakefile:125 for the list of possible RGV values

From ec4e066f224b857f612dbe5502b04a8df49e40b5 Mon Sep 17 00:00:00 2001
From: Samuel Giddins <segiddins@segiddins.me>
Date: Tue, 26 Dec 2017 10:51:59 +0700
Subject: [PATCH 4/4] [Travis] Test against latest RubyGems version

---
 .travis.yml | 6 +++---
 Rakefile    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 582eb56c09f..543df2bcda5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ 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.1
+  - RGV=v2.7.4
 
 matrix:
   include:
@@ -53,9 +53,9 @@ matrix:
       env: RGV=master
     # 1.x mode (we want to keep stuff passing in 1.x mode for now)
     - rvm: 2.4.2
-      env: RGV=v2.7.1 BUNDLER_SPEC_SUB_VERSION=1.98
+      env: RGV=v2.7.4 BUNDLER_SPEC_SUB_VERSION=1.98
     - rvm: 1.8.7
-      env: RGV=v2.7.1 BUNDLER_SPEC_SUB_VERSION=1.98
+      env: RGV=v2.7.4 BUNDLER_SPEC_SUB_VERSION=1.98
 
   allow_failures:
     - rvm: ruby-head
diff --git a/Rakefile b/Rakefile
index 2a0ff55c6ad..dcecf91165a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -147,7 +147,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.5 v2.4.8 v2.5.2 v2.6.8 v2.6.14 v2.7.1]
+      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.2 v2.6.8 v2.6.14 v2.7.4]
       (branches + releases).each do |rg|
         desc "Run specs with RubyGems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|