From 5a97c08ab31fc4661d3ccaf43a663beefed5b9d8 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Fri, 20 Nov 2020 13:52:37 +1100 Subject: [PATCH] java: only disable java version ranges on Big Sur --- .../extend/os/mac/requirements/java_requirement.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb index ebb4590511..5619850d06 100644 --- a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb +++ b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb @@ -27,11 +27,13 @@ class JavaRequirement < Requirement def java_home_cmd # TODO: enable for all macOS versions and Linux on next minor release - # but --version is broken on Big Sur today. - if @version && MacOS.version >= :big_sur - odisabled "depends_on :java", - '"depends_on "openjdk@11", "depends_on "openjdk@8" or "depends_on "openjdk"' + # but --version with ranges is broken on Big Sur today. + if MacOS.version >= :big_sur && @version&.end_with?("+") + odisabled %Q(depends_on java: "#{@version}"), + 'depends_on "openjdk@11", depends_on "openjdk@8" or depends_on "openjdk"' end + # odeprecated "depends_on :java", + # 'depends_on "openjdk@11", depends_on "openjdk@8" or depends_on "openjdk"' return unless File.executable?("/usr/libexec/java_home")