admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #12399 from Bo98/xcode-13.1-big_sur

Browse Source 
os/mac/xcode: update latest Xcode to 13.1 on Big Sur
This commit is contained in:
Bo Anderson 2021-11-08 19:47:23 +00:00 committed by GitHub
commit d8d52ba691
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/brew.sh
View File

@ -458,9 +458,7 @@ then
# Set a variable when the macOS system Ruby is new enough to avoid spawning # Set a variable when the macOS system Ruby is new enough to avoid spawning
# a Ruby process unnecessarily. # a Ruby process unnecessarily.
# On Catalina the system Ruby is technically new enough but don't allow it: if [[ "${HOMEBREW_MACOS_VERSION_NUMERIC}" -lt "120000" ]]
# https://github.com/Homebrew/brew/issues/9410
if [[ "${HOMEBREW_MACOS_VERSION_NUMERIC}" -lt "101600" ]]
then then
unset HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH unset HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH
else else

4
Library/Homebrew/cmd/vendor-install.sh
View File

@ -22,6 +22,10 @@ then
then then
ruby_FILENAME="portable-ruby-2.6.8.yosemite.bottle.tar.gz" ruby_FILENAME="portable-ruby-2.6.8.yosemite.bottle.tar.gz"
ruby_SHA="0cb1cc7af109437fe0e020c9f3b7b95c3c709b140bde9f991ad2c1433496dd42" ruby_SHA="0cb1cc7af109437fe0e020c9f3b7b95c3c709b140bde9f991ad2c1433496dd42"
elif [[ "${HOMEBREW_PROCESSOR}" == "arm64" ]]
then
ruby_FILENAME="portable-ruby-2.6.8.arm64_big_sur.bottle.tar.gz"
ruby_SHA="f2d5cab5a4dd49e5b3de780a3cd0a1f61642fea247d1c25aa40cd43f1be290b5"
fi fi
elif [[ -n "${HOMEBREW_LINUX}" ]] elif [[ -n "${HOMEBREW_LINUX}" ]]
then then

11
Library/Homebrew/extend/os/mac/diagnostic.rb
View File

@ -201,19 +201,12 @@ module Homebrew
end end
def check_ruby_version def check_ruby_version
# TODO: require 2.6.8 for everyone once enough have updated to Monterey return if RUBY_VERSION == HOMEBREW_REQUIRED_RUBY_VERSION
required_version = if MacOS.version >= :monterey ||
ENV["HOMEBREW_RUBY_PATH"].to_s.include?("/vendor/portable-ruby/")
"2.6.8"
else
HOMEBREW_REQUIRED_RUBY_VERSION
end
return if RUBY_VERSION == required_version
return if Homebrew::EnvConfig.developer? && OS::Mac.version.prerelease? return if Homebrew::EnvConfig.developer? && OS::Mac.version.prerelease?
<<~EOS <<~EOS
Ruby version #{RUBY_VERSION} is unsupported on macOS #{MacOS.version}. Homebrew Ruby version #{RUBY_VERSION} is unsupported on macOS #{MacOS.version}. Homebrew
is developed and tested on Ruby #{required_version}, and may not work correctly is developed and tested on Ruby #{HOMEBREW_REQUIRED_RUBY_VERSION}, and may not work correctly
on other Rubies. Patches are accepted as long as they don't cause breakage on other Rubies. Patches are accepted as long as they don't cause breakage
on supported Rubies. on supported Rubies.
EOS EOS

7
Library/Homebrew/os/mac/xcode.rb
View File

@ -21,10 +21,9 @@ module OS
# This may be a beta version for a beta macOS. # This may be a beta version for a beta macOS.
sig { params(macos: MacOS::Version).returns(String) } sig { params(macos: MacOS::Version).returns(String) }
def latest_version(macos: MacOS.version) def latest_version(macos: MacOS.version)
latest_stable = "13.0" latest_stable = "13.1"
case macos case macos
when "12" then "13.1" when "12", "11" then latest_stable
when "11" then latest_stable
when "10.15" then "12.4" when "10.15" then "12.4"
when "10.14" then "11.3.1" when "10.14" then "11.3.1"
when "10.13" then "10.1" when "10.13" then "10.1"
@ -239,7 +238,7 @@ module OS
when "11.0.3" then "11.7" when "11.0.3" then "11.7"
when "12.0.0" then "12.4" when "12.0.0" then "12.4"
when "12.0.5" then "12.5.1" when "12.0.5" then "12.5.1"
else "13.0" else "13.1"
end end
end end

2
Library/Homebrew/utils/ruby.sh
View File

@ -1,4 +1,4 @@
export HOMEBREW_REQUIRED_RUBY_VERSION=2.6.3 export HOMEBREW_REQUIRED_RUBY_VERSION=2.6.8
# HOMEBREW_LIBRARY is from the user environment # HOMEBREW_LIBRARY is from the user environment
# shellcheck disable=SC2154 # shellcheck disable=SC2154