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

Merge pull request #5985 from MikeMcQuaid/xcode-requirement-swift

Browse Source 
xcode_requirement: require macOS 10.14.4 for Xcode 10.2.
This commit is contained in:
Mike McQuaid 2019-04-04 09:05:17 +01:00 committed by GitHub
commit 04ee2454cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@ class XcodeRequirement < Requirement
def xcode_installed_version def xcode_installed_version
return false unless MacOS::Xcode.installed? return false unless MacOS::Xcode.installed?
return true unless @version return true unless @version
return true if xcode_swift_compatability?
MacOS::Xcode.version >= @version MacOS::Xcode.version >= @version
end end
@ -20,16 +21,24 @@ class XcodeRequirement < Requirement
def message def message
version = " #{@version}" if @version version = " #{@version}" if @version
message = <<~EOS message = <<~EOS
A full installation of Xcode.app#{version} is required to compile this software. A full installation of Xcode.app#{version} is required to compile
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
Xcode#{version} cannot be installed on macOS #{MacOS.version}. Xcode#{version} cannot be installed on macOS #{MacOS.version}.
You must upgrade your version of macOS. You must upgrade your version of macOS.
EOS EOS
else else
message + <<~EOS message + <<~EOS
Xcode can be installed from the App Store. Xcode can be installed from the App Store.
EOS EOS
end end
@ -38,4 +47,15 @@ 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::Xcode.version >= "10.14.4"
MacOS.version < "10.14"
end
end end