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

Merge pull request #6040 from claui/endorse-adoptopenjdk

Browse Source 
Endorse AdoptOpenJDK instead of Oracle OpenJDK
This commit is contained in:
Mike McQuaid 2019-04-20 13:14:26 +09:00 committed by GitHub
commit e68fc530c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Library/Homebrew/requirements/java_requirement.rb
View File

@ -4,19 +4,17 @@ class JavaRequirement < Requirement
attr_reader :java_home attr_reader :java_home
fatal true fatal true
download "https://www.oracle.com/technetwork/java/javase/downloads/index.html"
# A strict Java 8 requirement (1.8) should prompt the user to install # A strict Java 8 requirement (1.8) should prompt the user to install
# the legacy java8 cask because versions newer than Java 8 are not # an OpenJDK 1.8 distribution. Versions newer than Java 8 are not
# completely backwards compatible, and contain breaking changes such as # completely backwards compatible, and contain breaking changes such as
# strong encapsulation of JDK-internal APIs and a modified version scheme # strong encapsulation of JDK-internal APIs and a modified version scheme
# (*.0 not 1.*). # (*.0 not 1.*).
def cask def suggestion
if @version.nil? || @version.to_s.end_with?("+") || if fits_latest?
@version.to_f >= JAVA_CASK_MAP.keys.max.to_f JAVA_SUGGESTION_MAP.fetch(JAVA_SUGGESTION_MAP.keys.max)
JAVA_CASK_MAP.fetch(JAVA_CASK_MAP.keys.max)
else else
JAVA_CASK_MAP.fetch("1.8") JAVA_SUGGESTION_MAP.fetch("1.8")
end end
end end
@ -34,9 +32,8 @@ class JavaRequirement < Requirement
def message def message
version_string = " #{@version}" if @version version_string = " #{@version}" if @version
s = "Java#{version_string} is required to install this formula.\n" s = "Java#{version_string} is required to install this formula.\n"
s += super s += suggestion
s s
end end
@ -59,9 +56,22 @@ class JavaRequirement < Requirement
private private
JAVA_CASK_MAP = { CaskSuggestion = Struct.new(:token, :title) do
"1.8" => "homebrew/cask-versions/java8", def to_str
"11.0" => "java", title_string = " #{title}" if title
<<~EOS
Install#{title_string} with Homebrew Cask:
brew cask install #{token}
EOS
end
end
JAVA_SUGGESTION_MAP = {
"1.8" => CaskSuggestion.new(
"homebrew/cask-versions/adoptopenjdk8",
"AdoptOpenJDK 8",
),
"12.0" => CaskSuggestion.new("adoptopenjdk", "AdoptOpenJDK"),
}.freeze }.freeze
def version_without_plus def version_without_plus
@ -76,6 +86,12 @@ class JavaRequirement < Requirement
@version && @version.to_s.chars.last != "+" @version && @version.to_s.chars.last != "+"
end end
def fits_latest?
@version.nil? ||
@version.to_s.end_with?("+") ||
@version.to_f >= JAVA_SUGGESTION_MAP.keys.max.to_f
end
def setup_java def setup_java
java = preferred_java java = preferred_java
return unless java return unless java