@@ -21,8 +21,7 @@ class ScoverageExtension {
21
21
/* * a directory to write final output to */
22
22
File reportDir
23
23
/* * sources to highlight */
24
- SourceSet sourceSet
25
-
24
+ File sources
26
25
27
26
ScoverageExtension (Project project ) {
28
27
@@ -36,7 +35,7 @@ class ScoverageExtension {
36
35
description = ' Scoverage dependencies'
37
36
}
38
37
39
- sourceSet = project. sourceSets. create(ScoveragePlugin . CONFIGURATION_NAME ) {
38
+ project. sourceSets. create(ScoveragePlugin . CONFIGURATION_NAME ) {
40
39
def mainSourceSet = project. sourceSets. getByName(SourceSet . MAIN_SOURCE_SET_NAME )
41
40
42
41
java. source(mainSourceSet. java)
@@ -50,17 +49,16 @@ class ScoverageExtension {
50
49
dependsOn(project. tasks[ScoveragePlugin . COMPILE_NAME ])
51
50
}
52
51
53
- project. tasks. create(ScoveragePlugin . CHECK_NAME , OverallCheckTask . class) {
52
+ project. tasks. create(ScoveragePlugin . REPORT_NAME , JavaExec . class) {
54
53
dependsOn(project. tasks[ScoveragePlugin . TEST_NAME ])
55
54
}
56
55
57
- project. tasks. create(ScoveragePlugin . REPORT_NAME , JavaExec . class) {
58
- dependsOn(project. tasks[ScoveragePlugin . TEST_NAME ])
56
+ project. tasks. create(ScoveragePlugin . CHECK_NAME , OverallCheckTask . class) {
57
+ dependsOn(project. tasks[ScoveragePlugin . REPORT_NAME ])
59
58
}
60
59
61
60
dataDir = new File (project. buildDir, ' scoverage' )
62
61
reportDir = new File (project. buildDir, ' reports' + File . separatorChar + ' scoverage' )
63
-
64
62
}
65
63
66
64
private Action<Project > configureRuntimeOptions = new Action<Project > () {
@@ -69,6 +67,7 @@ class ScoverageExtension {
69
67
void execute (Project t ) {
70
68
71
69
def extension = ScoveragePlugin . extensionIn(t)
70
+ extension. sources = t. sourceSets. getByName(SourceSet . MAIN_SOURCE_SET_NAME ). scala. srcDirs. iterator(). next() as File
72
71
extension. dataDir. mkdirs()
73
72
extension. reportDir. mkdirs()
74
73
@@ -102,7 +101,7 @@ class ScoverageExtension {
102
101
project. configurations[ScoveragePlugin . CONFIGURATION_NAME ]
103
102
main = ' org.scoverage.ScoverageReport'
104
103
args = [
105
- extension. sourceSet . allSource . iterator() . next() . absolutePath ,
104
+ extension. sources ,
106
105
extension. dataDir. absolutePath,
107
106
extension. reportDir. absolutePath
108
107
]
0 commit comments