diff options
| author | Nik Vanderhoof <nikolasrvanderhoof@gmail.com> | 2019-06-02 04:37:39 -0400 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2019-06-02 16:37:39 +0800 |
| commit | de3da655e96cb4ed13e5142517043ae10f12f24a (patch) | |
| tree | 9caec4a03d110ab8a0881a4810de12b02077aca6 | |
| parent | 7cd9df33955a02b3762d59a8856c4c6519725d77 (diff) | |
| download | mill-de3da655e96cb4ed13e5142517043ae10f12f24a.tar.gz mill-de3da655e96cb4ed13e5142517043ae10f12f24a.tar.bz2 mill-de3da655e96cb4ed13e5142517043ae10f12f24a.zip | |
Inherit moduleDeps from outer in Scoverage (#623)
* Add test case that breaks via #622
Thanks to @kag0 for finding this! :)
* Scoverage should inherit moduleDeps
4 files changed, 10 insertions, 0 deletions
diff --git a/contrib/scoverage/src/ScoverageModule.scala b/contrib/scoverage/src/ScoverageModule.scala index 335643b6..4085ba2e 100644 --- a/contrib/scoverage/src/ScoverageModule.scala +++ b/contrib/scoverage/src/ScoverageModule.scala @@ -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() diff --git a/contrib/scoverage/test/resources/hello-world/core/src/Greet.scala b/contrib/scoverage/test/resources/hello-world/core/src/Greet.scala index 608becc9..90830bbc 100644 --- a/contrib/scoverage/test/resources/hello-world/core/src/Greet.scala +++ b/contrib/scoverage/test/resources/hello-world/core/src/Greet.scala @@ -3,4 +3,6 @@ object Greet { case Some(p) => s"Hello, ${p} ${name}!" case None => s"Hello, ${name}!" } + + val foo = Foo // testing module deps } diff --git a/contrib/scoverage/test/resources/hello-world/other/src/Foo.scala b/contrib/scoverage/test/resources/hello-world/other/src/Foo.scala new file mode 100644 index 00000000..d3c853cc --- /dev/null +++ b/contrib/scoverage/test/resources/hello-world/other/src/Foo.scala @@ -0,0 +1 @@ +object Foo diff --git a/contrib/scoverage/test/src/HelloWorldTests.scala b/contrib/scoverage/test/src/HelloWorldTests.scala index 433e413b..3d5a5114 100644 --- a/contrib/scoverage/test/src/HelloWorldTests.scala +++ b/contrib/scoverage/test/src/HelloWorldTests.scala @@ -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") |