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

Merge pull request #6500 from fxcoudert/catalina

Browse Source 
os/mac: support Catalina, drop Sierra
This commit is contained in:
Mike McQuaid 2019-10-08 09:50:47 +01:00 committed by GitHub
commit 29ab0ed571
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/os/mac.rb
View File

@ -44,14 +44,14 @@ module OS
# TODO: bump version when new macOS is released and also update # TODO: bump version when new macOS is released and also update
# references in docs/Installation.md and # references in docs/Installation.md and
# https://github.com/Homebrew/install/blob/master/install # https://github.com/Homebrew/install/blob/master/install
Version.new "10.14" Version.new "10.15"
end end
def outdated_release? def outdated_release?
# TODO: bump version when new macOS is released and also update # TODO: bump version when new macOS is released and also update
# references in docs/Installation.md and # references in docs/Installation.md and
# https://github.com/Homebrew/install/blob/master/install # https://github.com/Homebrew/install/blob/master/install
version < "10.12" version < "10.13"
end end
def prerelease? def prerelease?

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

@ -17,12 +17,12 @@ module OS
when "10.12" then "9.2" when "10.12" then "9.2"
when "10.13" then "10.1" when "10.13" then "10.1"
when "10.14" then "10.2.1" when "10.14" then "10.2.1"
when "10.15" then "11.0" when "10.15" then "11.1"
else else
raise "macOS '#{MacOS.version}' is invalid" unless OS::Mac.prerelease? raise "macOS '#{MacOS.version}' is invalid" unless OS::Mac.prerelease?
# Default to newest known version of Xcode for unreleased macOS versions. # Default to newest known version of Xcode for unreleased macOS versions.
"11.0" "11.1"
end end
end end
@ -177,7 +177,8 @@ module OS
when 91 then "9.4" when 91 then "9.4"
when 100 then "10.2.1" when 100 then "10.2.1"
when 110 then "11.0" when 110 then "11.0"
else "11.0" when 111 then "11.1"
else "11.1"
end end
end end
@ -245,7 +246,7 @@ module OS
# on the older supported platform for that Xcode release, i.e there's no # on the older supported platform for that Xcode release, i.e there's no
# CLT package for 10.11 that contains the Clang version from Xcode 8. # CLT package for 10.11 that contains the Clang version from Xcode 8.
case MacOS.version case MacOS.version
when "10.15" then "1100.0.20.17" when "10.15" then "1100.0.33.8"
when "10.14" then "1001.0.46.4" when "10.14" then "1001.0.46.4"
when "10.13" then "1000.10.44.2" when "10.13" then "1000.10.44.2"
when "10.12" then "900.0.39.2" when "10.12" then "900.0.39.2"

4
docs/Installation.md
View File

@ -11,7 +11,7 @@ it does it too. You have to confirm everything it will do before it starts.
## macOS Requirements ## macOS Requirements
* A 64-bit Intel CPU <sup>[1](#1)</sup> * A 64-bit Intel CPU <sup>[1](#1)</sup>
* macOS 10.12 (or higher) <sup>[2](#2)</sup> * macOS High Sierra (10.13) (or higher) <sup>[2](#2)</sup>
* Command Line Tools (CLT) for Xcode: `xcode-select --install`, * Command Line Tools (CLT) for Xcode: `xcode-select --install`,
[developer.apple.com/downloads](https://developer.apple.com/downloads) or [developer.apple.com/downloads](https://developer.apple.com/downloads) or
[Xcode](https://itunes.apple.com/us/app/xcode/id497799835) <sup>[3](#3)</sup> [Xcode](https://itunes.apple.com/us/app/xcode/id497799835) <sup>[3](#3)</sup>
@ -51,7 +51,7 @@ Uninstallation is documented in the [FAQ](FAQ.md).
<a name="1"><sup>1</sup></a> For 32-bit or PPC support see <a name="1"><sup>1</sup></a> For 32-bit or PPC support see
[Tigerbrew](https://github.com/mistydemeo/tigerbrew). [Tigerbrew](https://github.com/mistydemeo/tigerbrew).
<a name="2"><sup>2</sup></a> 10.12 or higher is recommended. 10.9–10.11 are <a name="2"><sup>2</sup></a> 10.13 or higher is recommended. 10.9–10.12 are
supported on a best-effort basis. For 10.4-10.6 see supported on a best-effort basis. For 10.4-10.6 see
[Tigerbrew](https://github.com/mistydemeo/tigerbrew). [Tigerbrew](https://github.com/mistydemeo/tigerbrew).