You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/01/25 12:41:28 UTC
[groovy] branch GROOVY_3_0_X updated: fix jacoco reporting
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
new 24a8375 fix jacoco reporting
24a8375 is described below
commit 24a8375765fdb463b296155b3c9868e303863191
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Jan 25 22:41:14 2020 +1000
fix jacoco reporting
---
gradle/jacoco/jacoco.gradle | 14 +++++++-------
gradle/jacoco/jacocofix.gradle | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/gradle/jacoco/jacoco.gradle b/gradle/jacoco/jacoco.gradle
index 64cb666..da29316 100644
--- a/gradle/jacoco/jacoco.gradle
+++ b/gradle/jacoco/jacoco.gradle
@@ -26,14 +26,14 @@ if (rootProject.hasProperty('coverage') && Boolean.valueOf(rootProject.getProper
apply plugin: 'jacoco'
}
- project.afterEvaluate {
+// project.afterEvaluate {
tasks.withType(JacocoReport) {
if (name != 'jacocoAllReport' && name != 'jacocoAllIndyReport') {
- sourceDirectories += files(project.sourceSets.main.allGroovy.srcDirs)
+ sourceDirectories.from = sourceDirectories + files(project.sourceSets.main.allGroovy.srcDirs)
// classDirectories += files(project.sourceSets.main.output)
}
}
- }
+// }
}
// To avoid "Can't add different class with same name" fatal error
@@ -72,8 +72,8 @@ if (rootProject.hasProperty('coverage') && Boolean.valueOf(rootProject.getProper
project.plugins.withType(JavaPlugin) {
def sd = sourceDirectories ?: files()
def cd = classDirectories ?: files()
- sourceDirectories = sd + files(project.sourceSets.main.allGroovy.srcDirs, project.sourceSets.main.allJava.srcDirs)
- classDirectories = cd + files(compileGroovy.destinationDir)
+ sourceDirectories.from = sd + files(project.sourceSets.main.allGroovy.srcDirs, project.sourceSets.main.allJava.srcDirs)
+ classDirectories.from = cd + files(compileGroovy.destinationDir)
}
}
}
@@ -84,8 +84,8 @@ if (rootProject.hasProperty('coverage') && Boolean.valueOf(rootProject.getProper
project.plugins.withType(JavaPlugin) {
def sd = sourceDirectories ?: files()
def cd = classDirectories ?: files()
- sourceDirectories = sd + files(project.sourceSets.main.allGroovy.srcDirs, project.sourceSets.main.allJava.srcDirs)
- classDirectories = cd + files(compileGroovyWithIndy.destinationDir)
+ sourceDirectories.from = sd + files(project.sourceSets.main.allGroovy.srcDirs, project.sourceSets.main.allJava.srcDirs)
+ classDirectories.from = cd + files(compileGroovyWithIndy.destinationDir)
}
}
}
diff --git a/gradle/jacoco/jacocofix.gradle b/gradle/jacoco/jacocofix.gradle
index d050118..9f9b8f1 100644
--- a/gradle/jacoco/jacocofix.gradle
+++ b/gradle/jacoco/jacocofix.gradle
@@ -20,7 +20,7 @@
// workaround for configuration of Jacoco task being executed before all information is available
gradle.taskGraph.whenReady {
tasks.withType(JacocoReport) {
- sourceDirectories = files(sourceSets.main.allGroovy.srcDirs + sourceSets.main.allJava.srcDirs)
- classDirectories = files(sourceSets.main.output)
+ sourceDirectories.from = files(sourceSets.main.allGroovy.srcDirs + sourceSets.main.allJava.srcDirs)
+ classDirectories.from = files(sourceSets.main.output)
}
}