X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=build.gradle;h=ba884a136dd5ff0fa5af7ef8935a827cd1849226;hb=bde972cad13060894eadcb189afc9fa3d8ec265a;hp=09d20f3f43e7209dd67f77f2eaf1ae4b17684e04;hpb=ae5ce37bfa1c480c7f1ec8a5874cc09e050da26d;p=jalview.git

diff --git a/build.gradle b/build.gradle
index 09d20f3..ba884a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ import groovy.transform.ExternalizeMethods
 
 buildscript {
   dependencies {
-    classpath 'org.openclover:clover:4.3.1'
+    classpath 'org.openclover:clover:4.4.1'
     classpath 'org.apache.commons:commons-compress:1.18'
   }
 }
@@ -63,7 +63,7 @@ ext {
     // TODO: get bamboo build artifact URL for getdown artifacts
     getdown_channel_base = bamboo_channelbase
     getdown_channel_name = bamboo_planKey + '/'+JAVA_VERSION
-    getdown_app_base = bamboo_channelbase + bamboo_planKey + bamboo_getdown_channel_suffix + '/'+JAVA_VERSION
+    getdown_app_base = bamboo_channelbase + '/'+ bamboo_planKey + bamboo_getdown_channel_suffix + '/'+JAVA_VERSION
     getdown_app_dir = getdown_app_dir_alt
     buildProperties = jalviewDir + "/" + classesDir +"/" + buildPropertiesFile
     break
@@ -272,7 +272,7 @@ sourceSets {
     compileClasspath = files( sourceSets.test.java.outputDir )
 
     if (use_clover) {
-      compileClasspath += sourceSets.clover.compileClasspath
+      compileClasspath = sourceSets.clover.compileClasspath
     } else {
       compileClasspath += files(sourceSets.main.java.outputDir)
     }
@@ -287,8 +287,8 @@ sourceSets {
 // clover bits
 dependencies {
   if (use_clover) {
-    cloverCompile 'org.openclover:clover:4.3.1'
-    testCompile 'org.openclover:clover:4.3.1'
+    cloverCompile 'org.openclover:clover:4.4.1'
+    testCompile 'org.openclover:clover:4.4.1'
   }
 }
 
@@ -452,7 +452,7 @@ eclipse {
 
 task cloverInstr() {
   // only instrument source, we build test classes as normal
-  inputs.files files (sourceSets.main.allJava) // , fileTree(dir:"$jalviewDir/$testSourceDir", include: ["**/*.java"]))
+  inputs.files files (sourceSets.main.allJava,sourceSets.test.allJava) // , fileTree(dir:"$jalviewDir/$testSourceDir", include: ["**/*.java"]))
   outputs.dir cloverInstrDir
 
   doFirst {