admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #6083 from MikeMcQuaid/require-xcode-10.2

Browse Source 
Require Xcode 10.2 on macOS 10.14
This commit is contained in:
Mike McQuaid 2019-05-01 13:36:49 +01:00 committed by GitHub
commit 48fb2ebf33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/os/mac/xcode.rb
View File

@ -27,7 +27,7 @@ module OS
def minimum_version def minimum_version
case MacOS.version case MacOS.version
when "10.14" then "10.0" when "10.14" then "10.2"
when "10.13" then "9.0" when "10.13" then "9.0"
when "10.12" then "8.0" when "10.12" then "8.0"
else "2.0" else "2.0"

18
Library/Homebrew/requirements/xcode_requirement.rb
View File

@ -14,7 +14,6 @@ class XcodeRequirement < Requirement
def xcode_installed_version def xcode_installed_version
return false unless MacOS::Xcode.installed? return false unless MacOS::Xcode.installed?
return false unless xcode_swift_compatability?
return true unless @version return true unless @version
MacOS::Xcode.version >= @version MacOS::Xcode.version >= @version
@ -26,12 +25,6 @@ class XcodeRequirement < Requirement
A full installation of Xcode.app#{version} is required to compile A full installation of Xcode.app#{version} is required to compile
this software. Installing just the Command Line Tools is not sufficient. this software. Installing just the Command Line Tools is not sufficient.
EOS EOS
unless xcode_swift_compatability?
message += <<~EOS
Xcode >=10.2 requires macOS >=10.14.4 to build many formulae.
EOS
end
if @version && Version.new(MacOS::Xcode.latest_version) < Version.new(@version) if @version && Version.new(MacOS::Xcode.latest_version) < Version.new(@version)
message + <<~EOS message + <<~EOS
@ -49,15 +42,4 @@ class XcodeRequirement < Requirement
def inspect def inspect
"#<#{self.class.name}: #{tags.inspect} version=#{@version.inspect}>" "#<#{self.class.name}: #{tags.inspect} version=#{@version.inspect}>"
end end
private
# TODO: when 10.14.4 and 10.2 have been around for long enough remove this
# method in favour of requiring 10.14.4 and 10.2.
def xcode_swift_compatability?
return true if MacOS::Xcode.version < "10.2"
return true if MacOS.full_version >= "10.14.4"
MacOS.full_version < "10.14"
end
end end