From de3da655e96cb4ed13e5142517043ae10f12f24a Mon Sep 17 00:00:00 2001
From: Nik Vanderhoof <nikolasrvanderhoof@gmail.com>
Date: Sun, 2 Jun 2019 04:37:39 -0400
Subject: Inherit moduleDeps from outer in Scoverage (#623)

* Add test case that breaks via #622

Thanks to @kag0 for finding this! :)

* Scoverage should inherit moduleDeps
---
 contrib/scoverage/src/ScoverageModule.scala                       | 1 +
 contrib/scoverage/test/resources/hello-world/core/src/Greet.scala | 2 ++
 contrib/scoverage/test/resources/hello-world/other/src/Foo.scala  | 1 +
 contrib/scoverage/test/src/HelloWorldTests.scala                  | 6 ++++++
 4 files changed, 10 insertions(+)
 create mode 100644 contrib/scoverage/test/resources/hello-world/other/src/Foo.scala

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")
-- 
cgit v1.2.3