Merge pull request #10461 from hyuraku/requirements/java_requirement_delete_adoptopenjdk_condition
requirements/java_requirement: delete adoptopenjdk condition
This commit is contained in:
commit
0097c2e604
@ -117,12 +117,6 @@ class JavaRequirement < Requirement
|
|||||||
def possible_javas
|
def possible_javas
|
||||||
javas = []
|
javas = []
|
||||||
javas << Pathname.new(ENV["JAVA_HOME"])/"bin/java" if ENV["JAVA_HOME"]
|
javas << Pathname.new(ENV["JAVA_HOME"])/"bin/java" if ENV["JAVA_HOME"]
|
||||||
jdk = begin
|
|
||||||
Formula["adoptopenjdk"]
|
|
||||||
rescue FormulaUnavailableError
|
|
||||||
nil
|
|
||||||
end
|
|
||||||
javas << jdk.bin/"java" if jdk&.latest_version_installed?
|
|
||||||
javas << which("java")
|
javas << which("java")
|
||||||
javas
|
javas
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user