Merge pull request #2736 from DomT4/xcodes

xcode: expect 8.3.3/recognise 9.0 on 10.13
This commit is contained in:
Misty De Meo 2017-06-05 23:03:21 -07:00 committed by GitHub
commit 576eb74593
3 changed files with 10 additions and 4 deletions

View File

@ -207,6 +207,8 @@ module OS
"8.3" => { clang: "8.1", clang_build: 802 }, "8.3" => { clang: "8.1", clang_build: 802 },
"8.3.1" => { 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.2" => { clang: "8.1", clang_build: 802 },
"8.3.3" => { clang: "8.1", clang_build: 802 },
"9.0" => { clang: "9.0", clang_build: 900 },
}.freeze }.freeze
def compilers_standard? def compilers_standard?

View File

@ -17,17 +17,19 @@ module OS
when "10.9" then "6.2" when "10.9" then "6.2"
when "10.10" then "7.2.1" when "10.10" then "7.2.1"
when "10.11" then "8.2.1" when "10.11" then "8.2.1"
when "10.12" then "8.3.2" when "10.12" then "8.3.3"
when "10.13" then "9.0"
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.
"8.3.2" "9.0"
end end
end end
def minimum_version def minimum_version
case MacOS.version case MacOS.version
when "10.13" then "9.0"
when "10.12" then "8.0" when "10.12" then "8.0"
else "2.0" else "2.0"
end end
@ -152,7 +154,8 @@ module OS
when 73 then "7.3" when 73 then "7.3"
when 80 then "8.0" when 80 then "8.0"
when 81 then "8.3" when 81 then "8.3"
else "8.3" when 90 then "9.0"
else "9.0"
end end
end end

View File

@ -12,7 +12,7 @@ Tools available for your platform:
| 10.9 | 6.2 | 6.2 | | 10.9 | 6.2 | 6.2 |
| 10.10 | 7.2.1 | 7.2 | | 10.10 | 7.2.1 | 7.2 |
| 10.11 | 8.2.1 | 8.2 | | 10.11 | 8.2.1 | 8.2 |
| 10.12 | 8.3.2 | 8.3 | | 10.12 | 8.3.3 | 8.3 |
## Compiler version database ## Compiler version database
@ -72,6 +72,7 @@ Tools available for your platform:
| 8.3 | — | — | — | — | 8.1 (802.0.38) | — | | 8.3 | — | — | — | — | 8.1 (802.0.38) | — |
| 8.3.1 | — | — | — | — | 8.1 (802.0.41) | — | | 8.3.1 | — | — | — | — | 8.1 (802.0.41) | — |
| 8.3.2 | — | — | — | — | 8.1 (802.0.42) | — | | 8.3.2 | — | — | — | — | 8.1 (802.0.42) | — |
| 8.3.3 | — | — | — | — | 8.1 (802.0.42) | — |
## References to Xcode and compiler versions in code ## References to Xcode and compiler versions in code
When a new Xcode release is made, the following things need to be When a new Xcode release is made, the following things need to be