diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-01-24 18:13:11 -0300 |
---|---|---|
committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-01-26 19:30:18 +0100 |
commit | 2d76ceadb283b0f72acc23603056cedfdd733db6 (patch) | |
tree | 914908eee7c39162346275576f997ad246b33b53 | |
parent | a2046a93b7b8e1e039048af2f60461858a03f916 (diff) | |
download | bundler-restore_2.0_deprecations.tar.gz |
Remove now meaningless deprecationsrestore_2.0_deprecations
-rw-r--r-- | lib/bundler/shared_helpers.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb index 600d241a4b..38df3a2cb9 100644 --- a/lib/bundler/shared_helpers.rb +++ b/lib/bundler/shared_helpers.rb @@ -158,16 +158,10 @@ module Bundler next if gemfiles.empty? break false if gemfiles.size == 1 end - if multiple_gemfiles - Bundler::SharedHelpers.major_deprecation 3, \ - "gems.rb and gems.locked will be preferred to Gemfile and Gemfile.lock." - end + return unless multiple_gemfiles - if RUBY_VERSION < "2" - major_deprecation(2, "Bundler will only support ruby >= 2.0, you are running #{RUBY_VERSION}") - end - return if Bundler.rubygems.provides?(">= 2") - major_deprecation(2, "Bundler will only support rubygems >= 2.0, you are running #{Bundler.rubygems.version}") + Bundler::SharedHelpers.major_deprecation 3, \ + "gems.rb and gems.locked will be preferred to Gemfile and Gemfile.lock." end def trap(signal, override = false, &block) |