From 2d76ceadb283b0f72acc23603056cedfdd733db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 24 Jan 2019 18:13:11 -0300 Subject: [PATCH] Remove now meaningless deprecations --- lib/bundler/shared_helpers.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb index 600d241a4b7..38df3a2cb96 100644 --- a/lib/bundler/shared_helpers.rb +++ b/lib/bundler/shared_helpers.rb @@ -158,16 +158,10 @@ def print_major_deprecations! 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)