Skip to content

Commit 875cfe0

Browse files
committed
rename report.dir to dataDir
1 parent d000401 commit 875cfe0

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/main/groovy/org/scoverage/OverallCheckTask.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ class OverallCheckTask extends DefaultTask {
1313

1414
@TaskAction
1515
void requireLineCoverage() {
16-
def reportDirName = project.extensions[ScoveragePlugin.CONFIGURATION_NAME].reportDirName
16+
def dataDirName = project.extensions[ScoveragePlugin.CONFIGURATION_NAME].dataDirName
1717

18-
if (cobertura == null) cobertura = project.file("$project.buildDir/reports/$reportDirName/cobertura.xml")
18+
if (cobertura == null) cobertura = project.file("$project.buildDir/reports/$dataDirName/cobertura.xml")
1919

2020
def xml = new XmlParser().parse(cobertura)
2121
def overallLineRate = xml.attribute('line-rate').toDouble()

src/main/groovy/org/scoverage/ScoverageExtension.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,16 @@ class ScoverageExtension {
6262
}
6363
t.tasks[ScoveragePlugin.TEST_NAME].configure {
6464
// TODO : fix this
65-
systemProperty 'scoverage.report.dir', "${t.buildDir}/reports/${t.extensions[ScoveragePlugin.CONFIGURATION_NAME].reportDirName}"
65+
systemProperty 'scoverage.dataDir', "${t.buildDir}/reports/${t.extensions[ScoveragePlugin.CONFIGURATION_NAME].dataDirName}"
6666
systemProperty 'scoverage.basedir', "${t.rootDir.absolutePath}" // for multi-module checking
6767

6868
def existingClasspath = classpath
6969
classpath = t.files(t.sourceSets[ScoveragePlugin.CONFIGURATION_NAME].output.classesDir) +
70-
project.configurations[ScoveragePlugin.CONFIGURATION_NAME] +
71-
existingClasspath
70+
project.configurations[ScoveragePlugin.CONFIGURATION_NAME] +
71+
existingClasspath
7272
}
7373
}
7474
}
7575

76-
String reportDirName = 'scoverage'
76+
String dataDirName = 'scoverage'
7777
}

0 commit comments

Comments
 (0)