From fdd18a4b79775ac71112cb2bc14efd80826833f5 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Wed, 16 Aug 2023 01:26:36 +0100 Subject: [PATCH 1/2] utils/gems: update to Bundler 2.4 --- Library/Homebrew/utils/gems.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/utils/gems.rb b/Library/Homebrew/utils/gems.rb index 86587ff10f..75be425cbd 100644 --- a/Library/Homebrew/utils/gems.rb +++ b/Library/Homebrew/utils/gems.rb @@ -10,7 +10,7 @@ require "English" module Homebrew # Keep in sync with the `Gemfile.lock`'s BUNDLED WITH. # After updating this, run `brew vendor-gems --update=--bundler`. - HOMEBREW_BUNDLER_VERSION = "2.3.26" + HOMEBREW_BUNDLER_VERSION = "2.4.18" module_function @@ -65,6 +65,8 @@ module Homebrew require "rubygems" raise "RubyGems too old!" if Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.2.0") + ENV["BUNDLER_NO_OLD_RUBYGEMS_WARNING"] = "1" + # Match where our bundler gems are. gem_home = "#{HOMEBREW_LIBRARY_PATH}/vendor/bundle/ruby/#{RbConfig::CONFIG["ruby_version"]}" Gem.paths = { From 444ee7fd4477fc23c5f2bd0242fc66c646ca795f Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Wed, 16 Aug 2023 01:28:51 +0100 Subject: [PATCH 2/2] brew vendor-gems: commit updates. --- Library/Homebrew/Gemfile.lock | 2 +- .../Homebrew/vendor/bundle/bundler/setup.rb | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index e9bdeb3b42..550846a683 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -230,4 +230,4 @@ RUBY VERSION ruby 2.6.10p210 BUNDLED WITH - 2.3.26 + 2.4.18 diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index 96d50c7ec0..32c0b88c7f 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -14,13 +14,17 @@ unless defined?(Gem) end end end -kernel = (class << ::Kernel; self; end) -[kernel, ::Kernel].each do |k| - if k.private_method_defined?(:gem_original_require) - private_require = k.private_method_defined?(:require) - k.send(:remove_method, :require) - k.send(:define_method, :require, k.instance_method(:gem_original_require)) - k.send(:private, :require) if private_require +if Gem.respond_to?(:discover_gems_on_require=) + Gem.discover_gems_on_require = false +else + kernel = (class << ::Kernel; self; end) + [kernel, ::Kernel].each do |k| + if k.private_method_defined?(:gem_original_require) + private_require = k.private_method_defined?(:require) + k.send(:remove_method, :require) + k.send(:define_method, :require, k.instance_method(:gem_original_require)) + k.send(:private, :require) if private_require + end end end $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/concurrent-ruby-1.2.2/lib/concurrent-ruby")