Merge branch 'improvement/JAL-3449_add_install4j_installer_getdown_versions_to_jalvie...
authorJim Procter <jprocter@issues.jalview.org>
Wed, 26 Feb 2020 14:52:19 +0000 (14:52 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 26 Feb 2020 14:52:19 +0000 (14:52 +0000)
1  2 
build.gradle
doc/building.md
gradle.properties

diff --cc 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
  
  
diff --cc doc/building.md
Simple merge
Simple merge