From: Ben Soares Date: Wed, 27 May 2020 16:37:12 +0000 (+0100) Subject: JAL-3541 ensure deletion of cloverReportDir X-Git-Tag: Release_2_11_1_1~13^2~26^2^2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=49524339723648257ede072113f9fa4928435b20;p=jalview.git JAL-3541 ensure deletion of cloverReportDir --- diff --git a/build.gradle b/build.gradle index 8e9dffd..2060073 100644 --- a/build.gradle +++ b/build.gradle @@ -139,7 +139,7 @@ ext { cloverBuildDir = "${buildDir}/clover" cloverInstrDir = file("${cloverBuildDir}/clover-instr") cloverClassesDir = file("${cloverBuildDir}/clover-classes") - cloverReportDir = file("${buildDir}/reports") + cloverReportDir = file("${buildDir}/reports/clover") cloverTestInstrDir = file("${cloverBuildDir}/clover-test-instr") cloverTestClassesDir = file("${cloverBuildDir}/clover-test-classes") //cloverTestClassesDir = cloverClassesDir @@ -645,6 +645,7 @@ eclipse { task cleanClover { doFirst { delete cloverBuildDir + delete cloverReportDir } } @@ -767,7 +768,7 @@ task cloverHtmlReport(type: JavaExec) { file(cloverDb).exists() } - def cloverHtmlDir = "${cloverReportDir}/clover" + def cloverHtmlDir = cloverReportDir inputs.dir cloverClassesDir outputs.dir cloverHtmlDir @@ -805,7 +806,7 @@ task cloverXmlReport(type: JavaExec) { file(cloverDb).exists() } - def cloverXmlFile = "${cloverReportDir}/clover/clover.xml" + def cloverXmlFile = "${cloverReportDir}/clover.xml" inputs.dir cloverClassesDir outputs.file cloverXmlFile