diff --git a/lib/bundler/cli/config.rb b/lib/bundler/cli/config.rb index 78e035aa023..8d2aba09162 100644 --- a/lib/bundler/cli/config.rb +++ b/lib/bundler/cli/config.rb @@ -25,7 +25,7 @@ def base(name = nil, *value) ["config", "get", ARGV[1]] end - SharedHelpers.major_deprecation 2, + SharedHelpers.major_deprecation 3, "Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle #{new_args.join(" ")}` instead." Base.new(options, name, value, self).run diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb index 5e1932e6260..01739ec4aaa 100644 --- a/lib/bundler/feature_flag.rb +++ b/lib/bundler/feature_flag.rb @@ -46,7 +46,7 @@ def self.settings_method(name, key, &default) settings_flag(:specific_platform) { bundler_3_mode? } settings_flag(:suppress_install_using_messages) { bundler_3_mode? } settings_flag(:unlock_source_unlocks_spec) { !bundler_3_mode? } - settings_flag(:update_requires_all_flag) { bundler_3_mode? } + settings_flag(:update_requires_all_flag) { bundler_4_mode? } settings_flag(:use_gem_version_promoter_for_major_updates) { bundler_3_mode? } settings_option(:default_cli_command) { bundler_3_mode? ? :cli_help : :install } diff --git a/spec/other/major_deprecation_spec.rb b/spec/other/major_deprecation_spec.rb index f743bccb92f..df2fdd263a9 100644 --- a/spec/other/major_deprecation_spec.rb +++ b/spec/other/major_deprecation_spec.rb @@ -127,7 +127,7 @@ bundle! "config" end - it "warns", :bundler => "2" do + it "warns", :bundler => "3" do expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config list` instead.") end @@ -139,7 +139,7 @@ bundle! "config waka" end - it "warns", :bundler => "2" do + it "warns", :bundler => "3" do expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config get waka` instead.") end @@ -151,7 +151,7 @@ bundle! "config waka wakapun" end - it "warns", :bundler => "2" do + it "warns", :bundler => "3" do expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config set waka wakapun` instead.") end @@ -163,7 +163,7 @@ bundle! "config --local waka wakapun" end - it "warns", :bundler => "2" do + it "warns", :bundler => "3" do expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config set --local waka wakapun` instead.") end @@ -175,7 +175,7 @@ bundle! "config --global waka wakapun" end - it "warns", :bundler => "2" do + it "warns", :bundler => "3" do expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config set --global waka wakapun` instead.") end @@ -187,7 +187,7 @@ bundle! "config --delete waka" end - it "warns", :bundler => "2" do + it "warns", :bundler => "3" do expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config unset waka` instead.") end @@ -199,7 +199,7 @@ bundle! "config --delete --local waka" end - it "warns", :bundler => "2" do + it "warns", :bundler => "3" do expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config unset --local waka` instead.") end @@ -211,7 +211,7 @@ bundle! "config --delete --global waka" end - it "warns", :bundler => "2" do + it "warns", :bundler => "3" do expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config unset --global waka` instead.") end @@ -227,7 +227,7 @@ G end - it "warns when no options are given", :bundler => "2" do + it "warns when no options are given", :bundler => "3" do bundle! "update" expect(deprecations).to include("Pass --all to `bundle update` to update everything") end