JAL-3130 add JAVA_VERSION to shadowJar classifier so artifacts are distinct

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index fa71080..d28807b 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -73,7 +73,7 @@ sourceSets {
 
     resources {
       srcDirs "$jalviewDir/$resourceDir"
-      srcDirs "$jalviewDir/$libDir"
+      srcDirs "$jalviewDir/$libDistDir"
     }
 
     jar.destinationDir = file("$jalviewDir/$packageDir")
@@ -296,8 +296,8 @@ task copyHelp(type: Copy) {
 }
 
 task syncLib(type: Sync) {
-  def syncDir = "$classes/$libDir"
-  from fileTree("$jalviewDir/$libDir")
+  def syncDir = "$classes/$libDistDir"
+  from fileTree("$jalviewDir/$libDistDir")
   into syncDir
 }
 
@@ -422,7 +422,7 @@ task copyJars(type: Copy) {
 
 // doing a Sync instead of Copy as Copy doesn't deal with "outputs" very well
 task syncJars(type: Sync) {
-  from fileTree("$jalviewDir/$libDir").include("**/*.jar").include("*.jar").files
+  from fileTree("$jalviewDir/$libDistDir").include("**/*.jar").include("*.jar").files
   into "$jalviewDir/$packageDir"
   preserve {
     include jar.archiveName
@@ -447,19 +447,19 @@ task cleanDist {
 
 shadowJar {
   dependsOn makeDist
-  if (JAVA_VERSION.equals("11")) {
-    from ("$jalviewDir/$j11libDir") {
+  from ("$jalviewDir/$libDistDir") {
       include("*.jar")
-    }
   }
   mainClassName = shadowJarMainClass
   mergeServiceFiles()
-  classifier = "all"
+  classifier = "all-"+JAVA_VERSION
   minimize()
 }
 
 ext {
-  getdownWebsiteDir = jalviewDir + '/' + getdown_website_dir
+  // where the getdown channel will be built. 
+  // TODO: consider allowing this expression to  be overrriden by -P arg
+  getdownWebsiteDir = jalviewDir + '/' + getdown_website_dir + '/' + JAVA_VERSION + '/'
   getdownAppDir = getdownWebsiteDir + '/' + getdown_app_dir
   getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir
   getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir