Add support for java version strings without periods, e.g. "12-ea" (java-beta).

This commit is contained in:
Gary Bartlett 2019-02-06 06:31:57 -08:00
parent 3349da1c1b
commit ff5dddab99

View File

@ -129,7 +129,7 @@ class JavaRequirement < Requirement
end end
def satisfies_version(java) def satisfies_version(java)
java_version_s = system_command(java, args: ["-version"], print_stderr: false).stderr[/\d+\.\d/] java_version_s = system_command(java, args: ["-version"], print_stderr: false).stderr[/\d+(\.\d)?/]
return false unless java_version_s return false unless java_version_s
java_version = Version.create(java_version_s) java_version = Version.create(java_version_s)