From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 26 Feb 2020 14:52:19 +0000 (+0000)
Subject: Merge branch 'improvement/JAL-3449_add_install4j_installer_getdown_versions_to_jalvie... 
X-Git-Tag: Develop-2_11_2_0-d20201215~90
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1bf282eb3a5bb347c78d047c7caf12548957749d;hp=--cc;p=jalview.git

Merge branch 'improvement/JAL-3449_add_install4j_installer_getdown_versions_to_jalview_console.2' into develop
---

1bf282eb3a5bb347c78d047c7caf12548957749d
diff --cc build.gradle
index db80bf4,36b75fd..ca73859
--- a/build.gradle
+++ b/build.gradle
@@@ -504,10 -577,18 +604,9 @@@ task cloverReport 
      onlyIf {
        file("${buildDir}/clover/clover.db").exists()
      }
 -  doFirst {
 -    def argsList = ["--initstring", "${buildDir}/clover/clover.db",
 -    "-o", "${reportsDir}/clover"]
 -    String[] args = argsList.toArray()
 -    com.atlassian.clover.reporters.html.HtmlReporter.runReport(args)
 -
 -    // and generate ${reportsDir}/clover/clover.xml
 -    args = ["--initstring", "${buildDir}/clover/clover.db",
 -    "-o", "${reportsDir}/clover/clover.xml"].toArray()
 -    com.atlassian.clover.reporters.xml.XMLReporter.runReport(args)
 -  }
 +    dependsOn cloverReportXML
 +    dependsOn cloverReportHTML
  }
- 
  // end clover bits