From: Ben Soares <bsoares@dundee.ac.uk>
Date: Tue, 18 Feb 2020 19:49:38 +0000 (+0000)
Subject: JAL-3449 merge from develop
X-Git-Tag: Develop-2_11_2_0-d20201215~80^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2d2853c51b3fd43918112e4f9a65bdcdcc2e43a5;p=jalview.git

JAL-3449 merge from develop
---

2d2853c51b3fd43918112e4f9a65bdcdcc2e43a5
diff --cc build.gradle
index 05fddc0,ba884a1..bd31eaa
--- a/build.gradle
+++ b/build.gradle
@@@ -9,7 -8,8 +9,7 @@@ import groovy.xml.XmlUti
  
  buildscript {
    dependencies {
-     classpath 'org.openclover:clover:4.3.1'
+     classpath 'org.openclover:clover:4.4.1'
 -    classpath 'org.apache.commons:commons-compress:1.18'
    }
  }
  
@@@ -534,21 -444,15 +534,21 @@@ eclipse 
          }
        }
      }
 -  }
  
 -  //synchronizationTasks eclipseClasspath
 -  //autoBuildTasks eclipseClasspath
 +  } // jdt
 +
 +  if (IN_ECLIPSE) {
 +    // Don't want these to be activated if in headless build
 +    synchronizationTasks "eclipseSynchronizationTask"
 +    autoBuildTasks "eclipseAutoBuildTask"
 +
 +  }
  }
  
 +
  task cloverInstr() {
    // only instrument source, we build test classes as normal
-   inputs.files files (sourceSets.main.allJava) // , fileTree(dir: testSourceDir, include: ["**/*.java"]))
+   inputs.files files (sourceSets.main.allJava,sourceSets.test.allJava) // , fileTree(dir:"$jalviewDir/$testSourceDir", include: ["**/*.java"]))
    outputs.dir cloverInstrDir
  
    doFirst {