From aea28044426f106fb3af025650535c2940080260 Mon Sep 17 00:00:00 2001 From: Chongyu Zhu Date: Wed, 24 Apr 2019 22:48:00 +0800 Subject: [PATCH] xcode: upgrade for Xcode 10.2.1 release --- Library/Homebrew/os/mac.rb | 69 ++++++++++++++++---------------- Library/Homebrew/os/mac/xcode.rb | 10 ++--- 2 files changed, 40 insertions(+), 39 deletions(-) diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb index 078e3fd0c5..c1dade5bbf 100644 --- a/Library/Homebrew/os/mac.rb +++ b/Library/Homebrew/os/mac.rb @@ -173,40 +173,41 @@ module OS end STANDARD_COMPILERS = { - "6.0" => { clang: "6.0", clang_build: 600 }, - "6.0.1" => { clang: "6.0", clang_build: 600 }, - "6.1" => { clang: "6.0", clang_build: 600 }, - "6.1.1" => { clang: "6.0", clang_build: 600 }, - "6.2" => { clang: "6.0", clang_build: 600 }, - "6.3" => { clang: "6.1", clang_build: 602 }, - "6.3.1" => { clang: "6.1", clang_build: 602 }, - "6.3.2" => { clang: "6.1", clang_build: 602 }, - "6.4" => { clang: "6.1", clang_build: 602 }, - "7.0" => { clang: "7.0", clang_build: 700 }, - "7.0.1" => { clang: "7.0", clang_build: 700 }, - "7.1" => { clang: "7.0", clang_build: 700 }, - "7.1.1" => { clang: "7.0", clang_build: 700 }, - "7.2" => { clang: "7.0", clang_build: 700 }, - "7.2.1" => { clang: "7.0", clang_build: 700 }, - "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 }, - "8.3.1" => { clang: "8.1", clang_build: 802 }, - "8.3.2" => { clang: "8.1", clang_build: 802 }, - "8.3.3" => { clang: "8.1", clang_build: 802 }, - "9.0" => { clang: "9.0", clang_build: 900 }, - "9.0.1" => { clang: "9.0", clang_build: 900 }, - "9.1" => { clang: "9.0", clang_build: 900 }, - "9.2" => { clang: "9.0", clang_build: 900 }, - "9.3" => { clang: "9.1", clang_build: 902 }, - "9.4" => { clang: "9.1", clang_build: 902 }, - "10.0" => { clang: "10.0", clang_build: 1000 }, - "10.1" => { clang: "10.0", clang_build: 1000 }, - "10.2" => { clang: "10.0", clang_build: 1001 }, + "6.0" => { clang: "6.0", clang_build: 600 }, + "6.0.1" => { clang: "6.0", clang_build: 600 }, + "6.1" => { clang: "6.0", clang_build: 600 }, + "6.1.1" => { clang: "6.0", clang_build: 600 }, + "6.2" => { clang: "6.0", clang_build: 600 }, + "6.3" => { clang: "6.1", clang_build: 602 }, + "6.3.1" => { clang: "6.1", clang_build: 602 }, + "6.3.2" => { clang: "6.1", clang_build: 602 }, + "6.4" => { clang: "6.1", clang_build: 602 }, + "7.0" => { clang: "7.0", clang_build: 700 }, + "7.0.1" => { clang: "7.0", clang_build: 700 }, + "7.1" => { clang: "7.0", clang_build: 700 }, + "7.1.1" => { clang: "7.0", clang_build: 700 }, + "7.2" => { clang: "7.0", clang_build: 700 }, + "7.2.1" => { clang: "7.0", clang_build: 700 }, + "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 }, + "8.3.1" => { clang: "8.1", clang_build: 802 }, + "8.3.2" => { clang: "8.1", clang_build: 802 }, + "8.3.3" => { clang: "8.1", clang_build: 802 }, + "9.0" => { clang: "9.0", clang_build: 900 }, + "9.0.1" => { clang: "9.0", clang_build: 900 }, + "9.1" => { clang: "9.0", clang_build: 900 }, + "9.2" => { clang: "9.0", clang_build: 900 }, + "9.3" => { clang: "9.1", clang_build: 902 }, + "9.4" => { clang: "9.1", clang_build: 902 }, + "10.0" => { clang: "10.0", clang_build: 1000 }, + "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 }, }.freeze def compilers_standard? diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 194bf237b5..7702576c7a 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -16,12 +16,12 @@ module OS when "10.11" then "8.2.1" when "10.12" then "9.2" when "10.13" then "10.1" - when "10.14" then "10.2" + when "10.14" then "10.2.1" else raise "macOS '#{MacOS.version}' is invalid" unless OS::Mac.prerelease? # Default to newest known version of Xcode for unreleased macOS versions. - "10.2" + "10.2.1" end end @@ -173,8 +173,8 @@ module OS when 81 then "8.3" when 90 then "9.2" when 91 then "9.4" - when 100 then "10.2" - else "10.2" + when 100 then "10.2.1" + else "10.2.1" end end @@ -242,7 +242,7 @@ 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.14" then "1001.0.46.3" + when "10.14" then "1001.0.46.4" when "10.13" then "1000.10.44.2" when "10.12" then "900.0.39.2" when "10.11" then "800.0.42.1"