You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/03/22 00:31:16 UTC
[groovy] branch master updated: fix jacoco reporting
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new d17a1a4 fix jacoco reporting
d17a1a4 is described below
commit d17a1a4452fa6f22e5729b721f5b9bc0104bd9a2
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Jan 25 20:41:14 2020 +0800
fix jacoco reporting
---
gradle/jacoco/jacoco.gradle | 19 +++++++------------
gradle/jacoco/jacocofix.gradle | 6 ++----
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/gradle/jacoco/jacoco.gradle b/gradle/jacoco/jacoco.gradle
index 9853f78..da29316 100644
--- a/gradle/jacoco/jacoco.gradle
+++ b/gradle/jacoco/jacoco.gradle
@@ -26,15 +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)
- additionalSourceDirs(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
@@ -73,10 +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)
- additionalSourceDirs(sd + files(project.sourceSets.main.allGroovy.srcDirs, project.sourceSets.main.allJava.srcDirs))
-// classDirectories = cd + files(compileGroovy.destinationDir)
- additionalClassDirs(cd + files(compileGroovy.destinationDir))
+ sourceDirectories.from = sd + files(project.sourceSets.main.allGroovy.srcDirs, project.sourceSets.main.allJava.srcDirs)
+ classDirectories.from = cd + files(compileGroovy.destinationDir)
}
}
}
@@ -87,10 +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)
- additionalSourceDirs(sd + files(project.sourceSets.main.allGroovy.srcDirs, project.sourceSets.main.allJava.srcDirs))
-// classDirectories = cd + files(compileGroovyWithIndy.destinationDir)
- additionalClassDirs(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 4780e9b..9f9b8f1 100644
--- a/gradle/jacoco/jacocofix.gradle
+++ b/gradle/jacoco/jacocofix.gradle
@@ -20,9 +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)
- additionalSourceDirs(files(sourceSets.main.allGroovy.srcDirs + sourceSets.main.allJava.srcDirs))
-// classDirectories = files(sourceSets.main.output)
- additionalClassDirs(files(sourceSets.main.output))
+ sourceDirectories.from = files(sourceSets.main.allGroovy.srcDirs + sourceSets.main.allJava.srcDirs)
+ classDirectories.from = files(sourceSets.main.output)
}
}