From c5bac087b34e90933acca1ee0371dd947cfa97a1 Mon Sep 17 00:00:00 2001 From: EricFromCanada <eric@lassosoft.com> Date: Tue, 28 Mar 2017 11:16:02 -0400 Subject: [PATCH] update latest versions of Xcode for 10.11 & 10.12 --- Library/Homebrew/os/mac.rb | 4 ++++ Library/Homebrew/os/mac/xcode.rb | 13 +++++++------ docs/Xcode.md | 8 ++++++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb index e09a9b3fd2..518936647f 100644 --- a/Library/Homebrew/os/mac.rb +++ b/Library/Homebrew/os/mac.rb @@ -201,6 +201,10 @@ module OS "7.3" => { clang: "7.3", clang_build: 703 }, "7.3.1" => { clang: "7.3", clang_build: 703 }, "8.0" => { clang: "8.0", clang_build: 800 }, + "8.1" => { clang: "8.0", clang_build: 800 }, + "8.2" => { clang: "8.0", clang_build: 800 }, + "8.2.1" => { clang: "8.0", clang_build: 800 }, + "8.3" => { clang: "8.1", clang_build: 802 }, }.freeze def compilers_standard? diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index e97a930088..70fe3c14d0 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -16,13 +16,13 @@ module OS when "10.8" then "5.1.1" when "10.9" then "6.2" when "10.10" then "7.2.1" - when "10.11" then "8.2" - when "10.12" then "8.2" + when "10.11" then "8.2.1" + when "10.12" then "8.3" else raise "macOS '#{MacOS.version}' is invalid" unless OS::Mac.prerelease? # Default to newest known version of Xcode for unreleased macOS versions. - "8.2" + "8.3" end end @@ -152,7 +152,8 @@ module OS when 70 then "7.0" when 73 then "7.3" when 80 then "8.0" - else "8.0" + when 81 then "8.3" + else "8.3" end end @@ -213,8 +214,8 @@ module OS # 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.12" then "800.0.42.1" - when "10.11" then "703.0.31" + when "10.12" then "802.0.38" + when "10.11" then "800.0.42.1" when "10.10" then "700.1.81" when "10.9" then "600.0.57" when "10.8" then "503.0.40" diff --git a/docs/Xcode.md b/docs/Xcode.md index c5a0a15000..759bf63c40 100644 --- a/docs/Xcode.md +++ b/docs/Xcode.md @@ -11,8 +11,8 @@ Tools available for your platform: | 10.8 | 5.1.1 | April 2014 | | 10.9 | 6.2 | 6.2 | | 10.10 | 7.2.1 | 7.2 | -| 10.11 | 8.0 | 7.3 | -| 10.12 | 8.0 | 8.0 | +| 10.11 | 8.2.1 | 8.2 | +| 10.12 | 8.3 | 8.3 | ## Compiler version database @@ -66,6 +66,10 @@ Tools available for your platform: | 7.3 | 鈥� | 鈥� | 鈥� | 鈥� | 7.3 (703.0.29) | 鈥� | | 7.3.1 | 鈥� | 鈥� | 鈥� | 鈥� | 7.3 (703.0.31) | 鈥� | | 8.0 | 鈥� | 鈥� | 鈥� | 鈥� | 8.0 (800.0.38) | 鈥� | +| 8.1 | 鈥� | 鈥� | 鈥� | 鈥� | 8.0 (800.0.42.1)| 鈥� | +| 8.2 | 鈥� | 鈥� | 鈥� | 鈥� | 8.0 (800.0.42.1)| 鈥� | +| 8.2.1 | 鈥� | 鈥� | 鈥� | 鈥� | 8.0 (800.0.42.1)| 鈥� | +| 8.3 | 鈥� | 鈥� | 鈥� | 鈥� | 8.1 (802.0.38) | 鈥� | ## References to Xcode and compiler versions in code When a new Xcode release is made, the following things need to be -- GitLab