JAL-3224 JAL-3196 specify file object in projectFile property for install4j task

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index b4a5077..a2bcfb7 100644 (file)
--- 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 {
@@ -664,7 +660,7 @@ task copyInstall4jTemplate(type: Copy) {
 task installers(type: com.install4j.gradle.Install4jTask) {
   dependsOn getdown
   dependsOn copyInstall4jTemplate
-  projectFile = install4jConf
+  projectFile = file install4jConf
   variables = [majorVersion: version.substring(2, 11), build: 001]
   destination = "$jalviewDir/$install4jBuildDir"
   buildSelected = true