From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 22 Apr 2019 12:25:44 +0000 (+0100)
Subject: JAL-3130 provide absolute module path as J11 compile argument, and drop unneeded... 
X-Git-Tag: Release_2_11_0~17^2~7^2~19
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=3729618c7df9803178a79112efe65bd4f08779ea;p=jalview.git

JAL-3130 provide absolute module path as J11 compile argument, and drop unneeded modules srcSet resource
---

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 {