summaryrefslogtreecommitdiff
path: root/lib/bundler/shared_helpers.rb
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-02-22 11:03:18 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-02-25 21:09:10 +0100
commit2f712047bcaf61f690fa1795a0057ba7850aae93 (patch)
tree1de20345829ab77feab2bedcd351256d0bb44f0f /lib/bundler/shared_helpers.rb
parent7c8597c486c9efcd708e0314584f78e08fbc03ce (diff)
downloadbundler-2f712047bcaf61f690fa1795a0057ba7850aae93.tar.gz
Remove unnecessary old rubygems deprecation
Diffstat (limited to 'lib/bundler/shared_helpers.rb')
-rw-r--r--lib/bundler/shared_helpers.rb10
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
index db3f123bca..996f7b3fd4 100644
--- a/lib/bundler/shared_helpers.rb
+++ b/lib/bundler/shared_helpers.rb
@@ -159,13 +159,9 @@ module Bundler
next if gemfiles.empty?
break false if gemfiles.size == 1
end
- if multiple_gemfiles && Bundler.bundler_major_version == 1
- Bundler::SharedHelpers.major_deprecation 2, \
- "gems.rb and gems.locked will be preferred to Gemfile and Gemfile.lock."
- end
-
- return if Bundler.rubygems.provides?(">= 2")
- major_deprecation(2, "Bundler will only support rubygems >= 2.0, you are running #{Bundler.rubygems.version}")
+ return unless multiple_gemfiles && Bundler.bundler_major_version == 1
+ Bundler::SharedHelpers.major_deprecation 2, \
+ "gems.rb and gems.locked will be preferred to Gemfile and Gemfile.lock."
end
def trap(signal, override = false, &block)