From 4002aade4a1b041f7e94120dfb60960779701304 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Fri, 14 Jun 2019 17:23:07 +0100 Subject: [PATCH] JAL-3130 added a bit of gradle support for compiling in Java 12 and potentially 13 --- build.gradle | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/build.gradle b/build.gradle index 3876753..f851c7d 100644 --- a/build.gradle +++ b/build.gradle @@ -97,6 +97,19 @@ if (JAVA_VERSION.equals("1.8")) { '--module-path', ext.modules_compileClasspath.asPath, '--add-modules', j11modules ] +} else if (JAVA_VERSION.equals("12") || JAVA_VERSION.equals("13")) { + JAVA_INTEGER_VERSION = JAVA_VERSION + libDir = j11libDir + libDistDir = j11libDir + compile_source_compatibility = JAVA_VERSION + compile_target_compatibility = JAVA_VERSION + getdown_alt_java_min_version = getdown_alt_java11_min_version + getdown_alt_multi_java_location = getdown_alt_java11_txt_multi_java_location + eclipse_java_runtime_name = "JavaSE-11" + additional_compiler_args += [ + '--module-path', ext.modules_compileClasspath.asPath, + '--add-modules', j11modules + ] } else { throw new GradleException("JAVA_VERSION=$JAVA_VERSION not currently supported by Jalview") } -- 1.7.10.2