From 426c6e2c3f24ec48c33c3937c96ae76ca786a495 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 9 Apr 2019 15:59:27 +0100 Subject: [PATCH] xcode_requirement: fix Swift compatability check. Ensure we're using the full macOS version so that `MacOS::Xcode.version >= "10.14.4"` can ever be true. --- Library/Homebrew/requirements/xcode_requirement.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/requirements/xcode_requirement.rb b/Library/Homebrew/requirements/xcode_requirement.rb index 248e362fe3..8d596fbf4a 100644 --- a/Library/Homebrew/requirements/xcode_requirement.rb +++ b/Library/Homebrew/requirements/xcode_requirement.rb @@ -12,8 +12,8 @@ class XcodeRequirement < Requirement def xcode_installed_version return false unless MacOS::Xcode.installed? + return false unless xcode_swift_compatability? return true unless @version - return true if xcode_swift_compatability? MacOS::Xcode.version >= @version end @@ -54,8 +54,8 @@ class XcodeRequirement < Requirement # 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" + return true if MacOS.full_version >= "10.14.4" - MacOS.version < "10.14" + MacOS.full_version < "10.14" end end