aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-03-21 16:32:35 +0100
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-08-03 09:30:00 +0900
commit6fb73e6043015fcd999a2c4b9a52b9bb1d9c4173 (patch)
tree466dab8a86597d159070c4331c31fa8bbdb54fd5 /lib
parent452516f50f80e3bbb6dc9911dcdb133a2e16c170 (diff)
downloadruby-6fb73e6043015fcd999a2c4b9a52b9bb1d9c4173.tar.gz
[bundler/bundler] Fully remove compatibility guard
https://github.com/bundler/bundler/commit/2a7a5daba0
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler.rb2
-rw-r--r--lib/bundler/compatibility_guard.rb9
-rw-r--r--lib/bundler/inline.rb2
-rw-r--r--lib/bundler/shared_helpers.rb2
4 files changed, 0 insertions, 15 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb
index 735750f59d..10dd4f65f9 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -1,7 +1,5 @@
# frozen_string_literal: true
-require_relative "bundler/compatibility_guard"
-
require_relative "bundler/vendored_fileutils"
require "pathname"
require "rbconfig"
diff --git a/lib/bundler/compatibility_guard.rb b/lib/bundler/compatibility_guard.rb
deleted file mode 100644
index eaff1a10d4..0000000000
--- a/lib/bundler/compatibility_guard.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-
-require_relative "version"
-
-if Bundler::VERSION.split(".").first.to_i >= 2
- if Gem::Version.new(Object::RUBY_VERSION.dup) < Gem::Version.new("2.3")
- abort "Bundler 2 requires Ruby 2.3 or later. Either install bundler 1 or update to a supported Ruby version."
- end
-end
diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb
index fed31ba4e3..c7c58de52b 100644
--- a/lib/bundler/inline.rb
+++ b/lib/bundler/inline.rb
@@ -1,7 +1,5 @@
# frozen_string_literal: true
-require_relative "compatibility_guard"
-
# Allows for declaring a Gemfile inline in a ruby script, optionally installing
# any gems that aren't already installed on the user's system.
#
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
index 85b92cf010..94eb866f2b 100644
--- a/lib/bundler/shared_helpers.rb
+++ b/lib/bundler/shared_helpers.rb
@@ -1,7 +1,5 @@
# frozen_string_literal: true
-require_relative "compatibility_guard"
-
require "pathname"
require "rbconfig"