From: Ben Soares <b.soares@dundee.ac.uk>
Date: Mon, 7 Dec 2020 13:29:39 +0000 (+0000)
Subject: JAL-3754 Fixed jar task creating strange dir because of outputs.file()
X-Git-Tag: Develop-2_11_2_0-d20201215~16
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=55729191375e41a426326c2f39997f19060038e3;p=jalview.git

JAL-3754 Fixed jar task creating strange dir because of outputs.file()
---

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