Skip to content

Commit 4a5a419

Browse files
committed
include scoverage in the main sourceset's runtime dependencies
1 parent 9e474a9 commit 4a5a419

File tree

4 files changed

+42
-2
lines changed

4 files changed

+42
-2
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import org.gradle.api.artifacts.Configuration
77
import org.gradle.api.file.FileCollection
88
import org.gradle.api.plugins.JavaPlugin
99
import org.gradle.api.plugins.scala.ScalaPlugin
10-
import org.gradle.api.tasks.JavaExec
1110
import org.gradle.api.tasks.SourceSet
1211
import org.gradle.api.tasks.bundling.Jar
1312
import org.gradle.api.tasks.testing.Test
@@ -75,7 +74,7 @@ class ScoverageExtension {
7574
scala.source(original.scala)
7675

7776
compileClasspath += original.compileClasspath + project.configurations.scoverage
78-
runtimeClasspath = it.output + project.configurations.runtime
77+
runtimeClasspath = it.output + project.configurations.scoverage + project.configurations.runtime
7978
}
8079

8180
def testSourceSet = project.sourceSets.create('testScoverage') {

src/test/groovy/org/scoverage/SimpleReportAcceptanceTest.groovy

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,10 @@ class SimpleReportAcceptanceTest extends AcceptanceTestUtils {
2828
testHappyDay(false)
2929
}
3030

31+
@Test
32+
public void testRun() throws Exception {
33+
File projectRoot = new File('src/test/runtime')
34+
def build = setupBuild(projectRoot, true)
35+
build.forTasks('clean', 'run').run()
36+
}
3137
}

src/test/runtime/build.gradle

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
description = 'a project that runs an application and captures scoverage'
2+
3+
buildscript {
4+
repositories {
5+
// need to get up to the working directory of gradle-plugins build
6+
flatDir dir: "${project.projectDir}/../../../build/libs"
7+
}
8+
dependencies {
9+
classpath name: 'gradle-scoverage', version: '+'
10+
}
11+
}
12+
13+
apply plugin: 'scoverage'
14+
15+
repositories {
16+
mavenCentral()
17+
}
18+
19+
dependencies {
20+
scoverage 'org.scoverage:scalac-scoverage-plugin_2.11:1.0.1',
21+
'org.scoverage:scalac-scoverage-runtime_2.11:1.0.1'
22+
compile 'org.scala-lang:scala-library:2.11.0'
23+
}
24+
25+
task run(type: JavaExec) {
26+
classpath = sourceSets.scoverage.runtimeClasspath
27+
main = 'hello.World'
28+
}
29+
30+
checkScoverage.dependsOn(run)
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package hello
2+
3+
object World extends App {
4+
println("ahoy")
5+
}

0 commit comments

Comments
 (0)