From 01a342550285a92d8eef84e27721389c40029f76 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 1 May 2019 09:06:41 +0100 Subject: [PATCH] Require Xcode 10.2 on macOS 10.14 Xcode >=10.2 is required to build all Swift formulae on macOS >=10.14.4. Rather than requiring per-formula workarounds (e.g. Homebrew/homebrew-core#39446) this provides a more stable platform Homebrew can rely on for building Swift formulae. --- Library/Homebrew/os/mac/xcode.rb | 2 +- .../Homebrew/requirements/xcode_requirement.rb | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 7702576c7a..32efc86394 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -27,7 +27,7 @@ module OS def minimum_version case MacOS.version - when "10.14" then "10.0" + when "10.14" then "10.2" when "10.13" then "9.0" when "10.12" then "8.0" else "2.0" diff --git a/Library/Homebrew/requirements/xcode_requirement.rb b/Library/Homebrew/requirements/xcode_requirement.rb index caeb67724b..3bdc95a908 100644 --- a/Library/Homebrew/requirements/xcode_requirement.rb +++ b/Library/Homebrew/requirements/xcode_requirement.rb @@ -14,7 +14,6 @@ class XcodeRequirement < Requirement def xcode_installed_version return false unless MacOS::Xcode.installed? - return false unless xcode_swift_compatability? return true unless @version MacOS::Xcode.version >= @version @@ -26,12 +25,6 @@ class XcodeRequirement < Requirement A full installation of Xcode.app#{version} is required to compile this software. Installing just the Command Line Tools is not sufficient. 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) message + <<~EOS @@ -49,15 +42,4 @@ class XcodeRequirement < Requirement def inspect "#<#{self.class.name}: #{tags.inspect} version=#{@version.inspect}>" 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