Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xcode: expect 8.3.3/recognise 9.0 on 10.13 #2736

Merged
merged 5 commits into from
Jun 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Library/Homebrew/os/mac.rb
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ def preferred_arch
"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 },
}.freeze

def compilers_standard?
Expand Down
9 changes: 6 additions & 3 deletions Library/Homebrew/os/mac/xcode.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,19 @@ def latest_version
when "10.9" then "6.2"
when "10.10" then "7.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
raise "macOS '#{MacOS.version}' is invalid" unless OS::Mac.prerelease?

# Default to newest known version of Xcode for unreleased macOS versions.
"8.3.2"
"9.0"
end
end

def minimum_version
case MacOS.version
when "10.13" then "9.0"
when "10.12" then "8.0"
else "2.0"
end
Expand Down Expand Up @@ -152,7 +154,8 @@ def uncached_version
when 73 then "7.3"
when 80 then "8.0"
when 81 then "8.3"
else "8.3"
when 90 then "9.0"
else "9.0"
end
end

Expand Down
3 changes: 2 additions & 1 deletion docs/Xcode.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Tools available for your platform:
| 10.9 | 6.2 | 6.2 |
| 10.10 | 7.2.1 | 7.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

Expand Down Expand Up @@ -72,6 +72,7 @@ Tools available for your platform:
| 8.3 | — | — | — | — | 8.1 (802.0.38) | — |
| 8.3.1 | — | — | — | — | 8.1 (802.0.41) | — |
| 8.3.2 | — | — | — | — | 8.1 (802.0.42) | — |
| 8.3.3 | — | — | — | — | 8.1 (802.0.42) | — |

## References to Xcode and compiler versions in code
When a new Xcode release is made, the following things need to be
Expand Down