Remove major_deprecations feature flag

Leave it as a setting with default true value.
rubygems · Feb 21, 2019 · 76c411d · 76c411d
1 parent a6f593f
commit 76c411d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb
@@ -44,7 +44,6 @@ def self.settings_method(name, key, &default)
     settings_flag(:init_gems_rb) { bundler_2_mode? }
     settings_flag(:list_command) { bundler_2_mode? }
     settings_flag(:lockfile_uses_separate_rubygems_sources) { bundler_2_mode? }
-    settings_flag(:major_deprecations) { bundler_2_mode? }
     settings_flag(:only_update_to_newer_versions) { bundler_2_mode? }
     settings_flag(:path_relative_to_cwd) { bundler_2_mode? }
     settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }

diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
@@ -76,6 +76,7 @@ class Settings
     ].freeze
 
     DEFAULT_CONFIG = {
+      :major_deprecations => true,
       :disable_version_check => true,
       :prefer_patch => false,
       :redirect => 5,

diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
@@ -374,7 +374,7 @@ def resolve_path(path)
 
     def prints_major_deprecations?
       require "bundler"
-      return false unless Bundler.feature_flag.major_deprecations?
+      return false unless Bundler.settings[:major_deprecations]
       require "bundler/deprecate"
       return false if Bundler::Deprecate.skip
       true