From 2a5aee0a0b98f40d6936d124c67cc3ec33d6ee03 Mon Sep 17 00:00:00 2001 From: Chongyu Zhu Date: Tue, 4 Jun 2019 16:11:18 -0700 Subject: [PATCH] xcode: add initial support for Xcode 11.0 --- Library/Homebrew/os/mac.rb | 3 ++- Library/Homebrew/os/mac/xcode.rb | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb index c1dade5bbfb5a..ab2b6830984a5 100644 --- a/Library/Homebrew/os/mac.rb +++ b/Library/Homebrew/os/mac.rb @@ -37,7 +37,7 @@ def full_version=(version) def latest_sdk_version # TODO: bump version when new Xcode macOS SDK is released - Version.new "10.14" + Version.new "10.15" end def latest_stable_version @@ -208,6 +208,7 @@ def preferred_arch "10.1" => { clang: "10.0", clang_build: 1000 }, "10.2" => { clang: "10.0", clang_build: 1001 }, "10.2.1" => { clang: "10.0", clang_build: 1001 }, + "11.0" => { clang: "11.0", clang_build: 1100 }, }.freeze def compilers_standard? diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 32efc86394a22..5f35f45bc52fa 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -17,16 +17,18 @@ def latest_version when "10.12" then "9.2" when "10.13" then "10.1" when "10.14" then "10.2.1" + when "10.15" then "11.0" else raise "macOS '#{MacOS.version}' is invalid" unless OS::Mac.prerelease? # Default to newest known version of Xcode for unreleased macOS versions. - "10.2.1" + "11.0" end end def minimum_version case MacOS.version + when "10.15" then "11.0" when "10.14" then "10.2" when "10.13" then "9.0" when "10.12" then "8.0" @@ -174,7 +176,8 @@ def detect_version_from_clang_version when 90 then "9.2" when 91 then "9.4" when 100 then "10.2.1" - else "10.2.1" + when 110 then "11.0" + else "11.0" end end @@ -242,6 +245,7 @@ def latest_version # 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. case MacOS.version + when "10.15" then "1100.0.20.17" when "10.14" then "1001.0.46.4" when "10.13" then "1000.10.44.2" when "10.12" then "900.0.39.2" @@ -253,6 +257,7 @@ def latest_version def minimum_version case MacOS.version + when "10.15" then "11.0.0" when "10.14" then "10.0.0" when "10.13" then "9.0.0" when "10.12" then "8.0.0"