This is an automated email from the ASF dual-hosted git repository. benw pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit 4e1e411ca2164b254f19bd8f574e115d5cc685de Author: Ben Weidig <[email protected]> AuthorDate: Sat Mar 14 09:55:10 2026 +0100 TAP5-2819: enable JaCoCo XML export, move HTML output --- build.gradle | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index c91d111ea..cfa3c0394 100755 --- a/build.gradle +++ b/build.gradle @@ -333,12 +333,15 @@ tasks.register('combinedJacocoReport', JacocoReport) { def subprojectsToConsider = subprojects.findAll { !excludedProjects.contains(it.name) } + dependsOn subprojectsToConsider.test - dependsOn = subprojectsToConsider.test + def classFiles = files(subprojectsToConsider.sourceSets.main.output).asFileTree.matching { + exclude 'org/apache/tapestry5/internal/plastic/asm/**' + } + classDirectories.from(classFiles) additionalSourceDirs.from(files(subprojectsToConsider.sourceSets.main.allSource.srcDirs)) sourceDirectories.from(files(subprojectsToConsider.sourceSets.main.allSource.srcDirs)) - classDirectories.from(files(subprojectsToConsider.sourceSets.main.output)) executionData.from(files(subprojectsToConsider.jacocoTestReport.executionData).filter { it.exists() }) @@ -347,9 +350,12 @@ tasks.register('combinedJacocoReport', JacocoReport) { reports { html { required = true - outputLocation = layout.buildDirectory.dir('reports/jacoco') + outputLocation = layout.buildDirectory.dir('reports/jacoco/html') + } + xml { + required = true + outputLocation = layout.buildDirectory.file('reports/jacoco/jacoco.xml') } - xml.required = false csv.required = false } }
