Merge branch 'merge/develop_and_rebase_squashed_merge_JAL-3628+JAL-3608+JAL-3609...

diff --git a/build.gradle b/build.gradle
index 07c9476..147c2ef 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1363,8 +1363,8 @@ jar {
     "Implementation-Version": JALVIEW_VERSION
   }
 
-  def distDir = "${jalviewDir}/${package_dir}"
-  destinationDirectory = file(distDir)
+  def outputDir = "${jalviewDir}/${package_dir}"
+  destinationDirectory = file(outputDir)
   archiveFileName = rootProject.name+".jar"
 
   exclude "cache*/**"
@@ -1377,7 +1377,7 @@ jar {
   sourceSets.main.resources.srcDirs.each{ dir ->
     inputs.dir(dir)
   }
-  outputs.file("${distDir}/${archiveFileName}")
+  outputs.file("${outputDir}/${archiveFileName}")
 }