X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=38d35f4a385f9d21db2ef1d062c953f094bf7329;hb=3729618c7df9803178a79112efe65bd4f08779ea;hp=b4a507703909a11bb5a647bbe740dd13e22b8840;hpb=fe1a2bf71a933785bc5e5218deecd0125c0103f5;p=jalview.git diff --git a/build.gradle b/build.gradle index b4a5077..38d35f4 100644 --- a/build.gradle +++ b/build.gradle @@ -35,6 +35,8 @@ if (clover.equals("true")) { classes = "$jalviewDir/$classesDir" } +// configure classpath/args for j8/j11 compilation + def libDir def libDistDir def compile_source_compatibility @@ -54,7 +56,7 @@ if (JAVA_VERSION.equals("1.8")) { compile_target_compatibility = 11 getdown_alt_java_min_version = getdown_alt_java11_min_version additional_compiler_args += [ - '--module-path', sourceSets.modules.compileClasspath.asPath, + '--module-path', file("$jalviewDir/$j11modDir").getAbsolutePath(), '--add-modules', j11modules ] } else { @@ -81,12 +83,6 @@ sourceSets { runtimeClasspath = compileClasspath } - - modules { - compileClasspath = fileTree(dir: "$jalviewDir/$j11modDir", include: ["*.jar"]) - - runtimeClasspath = compileClasspath - } clover { java {