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

java: only disable java version ranges on Big Sur

Browse Source
This commit is contained in:
Jonathan Chang 2020-11-20 13:52:37 +11:00
parent 6d850a97a1
commit 5a97c08ab3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/extend/os/mac/requirements/java_requirement.rb
View File

@ -27,11 +27,13 @@ class JavaRequirement < Requirement
def java_home_cmd def java_home_cmd
# TODO: enable for all macOS versions and Linux on next minor release # TODO: enable for all macOS versions and Linux on next minor release
# but --version is broken on Big Sur today. # but --version with ranges is broken on Big Sur today.
if @version && MacOS.version >= :big_sur if MacOS.version >= :big_sur && @version&.end_with?("+")
odisabled "depends_on :java", odisabled %Q(depends_on java: "#{@version}"),
'"depends_on "openjdk@11", "depends_on "openjdk@8" or "depends_on "openjdk"' 'depends_on "openjdk@11", depends_on "openjdk@8" or depends_on "openjdk"'
end 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") return unless File.executable?("/usr/libexec/java_home")