Skip to content

Commit bfd830a

Browse files
committed
Added runtime project to test classpaths
1 parent da7f956 commit bfd830a

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

project/Scoverage.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import sbt._
33

44
object Scoverage extends Build {
55

6-
val Org = "org.scoverage"
6+
val Org = "org.coverage"
77
val Version = "1.0.0.BETA1"
88
val Scala = "2.11.4"
99
val Slf4jVersion = "1.7.7"
@@ -42,18 +42,18 @@ object Scoverage extends Build {
4242
}
4343
)
4444

45-
lazy val root = Project("scalac-scoverage", file("."))
46-
.settings(name := "scalac-scoverage")
45+
lazy val root = Project("scalac-coverage", file("."))
46+
.settings(name := "scalac-coverage")
4747
.settings(appSettings: _*)
4848
.settings(publishArtifact := false)
4949
.aggregate(plugin, runtime)
5050

51-
lazy val runtime = Project("scalac-scoverage-runtime", file("scalac-scoverage-runtime"))
51+
lazy val runtime = Project("scalac-coverage-runtime", file("scalac-scoverage-runtime"))
5252
.settings(name := "scalac-scoverage-runtime")
5353
.settings(appSettings: _*)
5454

55-
lazy val plugin = Project("scalac-scoverage-plugin", file("scalac-scoverage-plugin"))
56-
.settings(name := "scalac-scoverage-plugin")
55+
lazy val plugin = Project("scalac-coverage-plugin", file("scalac-scoverage-plugin"))
56+
.settings(name := "scalac-coverage-plugin")
5757
.dependsOn(runtime)
5858
.settings(appSettings: _*)
5959
.settings(libraryDependencies ++= Seq(

scalac-scoverage-plugin/src/test/scala/scoverage/PluginRunner.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ trait PluginSupport {
1414
val scalaVersion = "2.11.4"
1515
val shortScalaVersion = scalaVersion.dropRight(2)
1616

17-
val classPath = getScalaJars.map(_.getAbsolutePath) :+ sbtCompileDir.getAbsolutePath
17+
val classPath = getScalaJars.map(_.getAbsolutePath) :+ sbtCompileDir.getAbsolutePath :+ runtimeClasses.getAbsolutePath
1818

1919
val settings = {
2020
val s = new scala.tools.nsc.Settings
@@ -54,6 +54,8 @@ trait PluginSupport {
5454
scalaJars.map(findScalaJar)
5555
}
5656

57+
def runtimeClasses: File = new File("./scalac-scoverage-runtime/target/scala-2.11/classes")
58+
5759
def findScalaJar(artifactId: String): File = findIvyJar("org.scala-lang", artifactId, scalaVersion)
5860

5961
def findIvyJar(groupId: String, artifactId: String, version: String): File = {

0 commit comments

Comments
 (0)