From e2aae0fa63fec52f5e648e1d8f7c529ec5fce51f Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Wed, 12 Apr 2023 12:22:20 +0100
Subject: [PATCH] Require Ruby 2.6.10

---
 Library/Homebrew/Gemfile.lock                | 2 +-
 Library/Homebrew/brew.sh                     | 2 +-
 Library/Homebrew/extend/os/mac/diagnostic.rb | 1 -
 Library/Homebrew/utils/ruby.sh               | 4 +++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index e09436a75c..3d2b523333 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -266,7 +266,7 @@ DEPENDENCIES
   warning
 
 RUBY VERSION
-   ruby 2.6.8p205
+   ruby 2.6.10p210
 
 BUNDLED WITH
    2.3.26
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 379e18b818..35a74283fc 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -540,7 +540,7 @@ then
 
   # Set a variable when the macOS system Ruby is new enough to avoid spawning
   # a Ruby process unnecessarily.
-  if [[ "${HOMEBREW_MACOS_VERSION_NUMERIC}" -lt "120000" ]]
+  if [[ "${HOMEBREW_MACOS_VERSION_NUMERIC}" -lt "120601" ]]
   then
     unset HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH
   else
diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index 1cbc907f33..d7920fa2fd 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -206,7 +206,6 @@ module Homebrew
 
       def check_ruby_version
         return if RUBY_VERSION == HOMEBREW_REQUIRED_RUBY_VERSION
-        return if RUBY_VERSION == "2.6.10" # TODO: require 2.6.10
         return if Homebrew::EnvConfig.developer? && OS::Mac.version.prerelease?
 
         <<~EOS
diff --git a/Library/Homebrew/utils/ruby.sh b/Library/Homebrew/utils/ruby.sh
index a7bb83c4a0..087e28dc5d 100644
--- a/Library/Homebrew/utils/ruby.sh
+++ b/Library/Homebrew/utils/ruby.sh
@@ -1,4 +1,6 @@
-export HOMEBREW_REQUIRED_RUBY_VERSION=2.6.8
+# When bumping, run `brew vendor-gems --update=--ruby`
+# When bumping to a new major/minor version, also update the bounds in the Gemfile
+export HOMEBREW_REQUIRED_RUBY_VERSION=2.6.10
 
 # HOMEBREW_LIBRARY is from the user environment
 # shellcheck disable=SC2154