Support discovering jdk-11 (#25445)

This is default directory that it is installed at now and the regex
didn't match it
This commit is contained in:
Christopher Batey 2018-08-09 10:31:29 +01:00 committed by Konrad `ktoso` Malawski
parent 167c8e3591
commit 487d32e16f

View file

@ -96,7 +96,7 @@ object CrossJava {
object JavaDiscoverConfig {
class LinuxDiscoverConfig(base: File) extends JavaDiscoverConf {
val JavaHomeDir = """(java-|jdk)(1\.)?([0-9]+).*""".r
val JavaHomeDir = """(java-|jdk-?)(1\.)?([0-9]+).*""".r
def javaHomes: Vector[(String, File)] =
wrapNull(base.list())