From 7603d05d053db11c7a7606d5fc414cee3b23df13 Mon Sep 17 00:00:00 2001 From: commitay Date: Wed, 7 Mar 2018 08:20:05 +1000 Subject: [PATCH 1/3] cask dsl caveats --- Library/Homebrew/cask/lib/hbc/dsl/caveats.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/cask/lib/hbc/dsl/caveats.rb b/Library/Homebrew/cask/lib/hbc/dsl/caveats.rb index a6cbdd6bf3..e10575e0cf 100644 --- a/Library/Homebrew/cask/lib/hbc/dsl/caveats.rb +++ b/Library/Homebrew/cask/lib/hbc/dsl/caveats.rb @@ -90,7 +90,7 @@ module Hbc brew cask install java EOS - elsif java_version.include?("9") || java_version.include?("+") + elsif java_version.include?("10") || java_version.include?("+") <<~EOS #{@cask} requires Java #{java_version}. You can install the latest version with From 032efdebda6ace3f1b63d2fc13bb5954aad6afd6 Mon Sep 17 00:00:00 2001 From: commitay Date: Wed, 7 Mar 2018 08:20:24 +1000 Subject: [PATCH 2/3] java_requirement --- .../Homebrew/extend/os/mac/requirements/java_requirement.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb index 2a48f02bd8..9dbda2024f 100644 --- a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb +++ b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb @@ -5,8 +5,8 @@ class JavaRequirement < Requirement end # A strict Java 8 requirement (1.8) should prompt the user to install - # the legacy java8 cask because the current version, Java 9, is not - # completely backwards compatible, and contains breaking changes such as + # the legacy java8 cask because versions newer than Java 8 are not + # completely backwards compatible, and contain breaking changes such as # strong encapsulation of JDK-internal APIs and a modified version scheme # (9.0 not 1.9). def cask @@ -22,7 +22,7 @@ class JavaRequirement < Requirement JAVA_CASK_MAP = { "1.8" => "caskroom/versions/java8", - "9.0" => "java", + "10.0" => "java", }.freeze def possible_javas From 8ac3f23b27add6d9e94853fdde3480d7b45612fc Mon Sep 17 00:00:00 2001 From: commitay Date: Wed, 7 Mar 2018 19:55:23 +1000 Subject: [PATCH 3/3] java_requirement comment --- Library/Homebrew/extend/os/mac/requirements/java_requirement.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb index 9dbda2024f..b8cf502a5e 100644 --- a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb +++ b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb @@ -8,7 +8,7 @@ class JavaRequirement < Requirement # the legacy java8 cask because versions newer than Java 8 are not # completely backwards compatible, and contain breaking changes such as # strong encapsulation of JDK-internal APIs and a modified version scheme - # (9.0 not 1.9). + # (*.0 not 1.*). def cask if @version.nil? || @version.to_s.end_with?("+") || @version.to_f >= JAVA_CASK_MAP.keys.max.to_f