Bump to a Bundler 2 version

3 files changed, 9 insertions, 77 deletions

diff --git a/.travis.yml b/.travis.yml
index 93446375ba..74086969fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,11 +28,6 @@ addons:
 rvm:
   - 2.4.1
   - 2.3.4
-  - 2.2.7
-  - 2.1.10
-  - 2.0.0
-  - 1.9.3
-  - 1.8.7
 
 # Rubygems versions MUST be available as rake tasks
 # see Rakefile:125 for the list of possible RGV values
@@ -40,86 +35,23 @@ 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.6.8
+  - RGV=v2.6.13
 
 matrix:
   include:
-    - rvm: 2.4.1
-      env: RGV=v2.6.8 BUNDLER_SPEC_SUB_VERSION=2.0.0
     # Ruby 2.4, Rubygems 2.6.8 and up
     # Ruby 2.3, Rubygems 2.5.1 and up
-    - rvm: 2.2.6
+    - rvm: 2.3.4
       env: RGV=v2.5.2
-    # Ruby 2.2, Rubygems 2.4.5 and up
-    - rvm: 2.2.6
-      env: RGV=v2.4.8
-    # Ruby 2.1, Rubygems 2.2.2 and up
-    - rvm: 2.1.10
-      env: RGV=v2.2.5
-    # Ruby 2.0.0, Rubygems 2.0.0 and up
-    - rvm: 2.0.0
-      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.5
-    - rvm: 1.9.3
-      env: RGV=v2.1.11
-    - rvm: 1.9.3
-      env: RGV=v2.0.14
-    - rvm: 1.9.3
-      env: RGV=v1.8.29
-    - rvm: 1.9.3
-      env: RGV=v1.7.2
-    - rvm: 1.9.3
-      env: RGV=v1.6.2
-    - rvm: 1.9.3
-      env: RGV=v1.5.3
-
-    # Ruby 1.8.7, Rubygems 1.3.6 and up
-    - rvm: 1.8.7
-      env: RGV=v2.2.5
-    # ALLOWED FAILURES
-    # since the great Travis image outage, frequent random segfaults :'(
-    - rvm: 1.8.7
-      env: RGV=v2.0.14
-    - rvm: 1.8.7
-      env: RGV=v1.8.29
-    - rvm: 1.8.7
-      env: RGV=v1.7.2
-    - rvm: 1.8.7
-      env: RGV=v1.6.2
-    - rvm: 1.8.7
-      env: RGV=v1.5.3
-    - rvm: 1.8.7
-      env: RGV=v1.4.2
-    - rvm: 1.8.7
-      env: RGV=v1.3.7
-    - rvm: 1.8.7
-      env: RGV=v1.3.6
     # Ruby-head (we want to know how we're doing, but not fail the build)
     - rvm: ruby-head
       env: RGV=master
+    # 1.x mode (we want to keep stuff passing in 1.x mode for now)
+    - rvm: 2.4.1
+      env: RGV=v2.6.13 BUNDLER_SPEC_SUB_VERSION=1.98
+    - rvm: 1.8.7
+      env: RGV=v2.6.13 BUNDLER_SPEC_SUB_VERSION=1.98
 
   allow_failures:
-    - rvm: 1.8.7
-      env: RGV=v2.0.14
-    - rvm: 1.8.7
-      env: RGV=v1.8.29
-    - rvm: 1.8.7
-      env: RGV=v1.7.2
-    - rvm: 1.8.7
-      env: RGV=v1.6.2
-    - rvm: 1.8.7
-      env: RGV=v1.5.3
-    - rvm: 1.8.7
-      env: RGV=v1.4.2
-    - rvm: 1.8.7
-      env: RGV=v1.3.7
-    - rvm: 1.8.7
-      env: RGV=v1.3.6
     - rvm: ruby-head
       env: RGV=master
diff --git a/Rakefile b/Rakefile
index 0b9f76b292..d61e3684a8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -144,7 +144,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]
+      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.13]
       (branches + releases).each do |rg|
         desc "Run specs with RubyGems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 9d869e5729..75d0817cca 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -7,7 +7,7 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.16.0.pre.2" unless defined?(::Bundler::VERSION)
+  VERSION = "2.0.0.dev" unless defined?(::Bundler::VERSION)
 
   def self.overwrite_loaded_gem_version
     begin