Skip to content

Commit

Permalink
Inherit moduleDeps from outer in Scoverage (#623)
Browse files Browse the repository at this point in the history
* Add test case that breaks via #622

Thanks to @kag0 for finding this! :)

* Scoverage should inherit moduleDeps
  • Loading branch information
nvander1 authored and lihaoyi committed Jun 2, 2019
1 parent 7cd9df3 commit de3da65
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions contrib/scoverage/src/ScoverageModule.scala
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ trait ScoverageModule extends ScalaModule { outer: ScalaModule =>
def selfDir = T { T.ctx().dest / os.up / os.up }
def dataDir = T { selfDir() / "data" }

def moduleDeps = outer.moduleDeps
def sources = outer.sources
def resources = outer.resources
def scalaVersion = outer.scalaVersion()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ object Greet {
case Some(p) => s"Hello, ${p} ${name}!"
case None => s"Hello, ${name}!"
}

val foo = Foo // testing module deps
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
object Foo
6 changes: 6 additions & 0 deletions contrib/scoverage/test/src/HelloWorldTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,16 @@ object HelloWorldTests extends utest.TestSuite {
}

object HelloWorld extends HelloBase {
object other extends ScalaModule {
def scalaVersion = "2.12.4"
}

object core extends ScoverageModule {
def scalaVersion = "2.12.4"
def scoverageVersion = "1.3.1"

def moduleDeps = Seq(other)

object test extends ScoverageTests {
override def ivyDeps = Agg(ivy"org.scalatest::scalatest:3.0.5")
def testFrameworks = Seq("org.scalatest.tools.Framework")
Expand Down

0 comments on commit de3da65

Please sign in to comment.