Merge branch '599'

1 files changed, 31 insertions, 2 deletions

diff --git a/build.sc b/build.sc
index 4ed072a1..c70aaf71 100755
--- a/build.sc
+++ b/build.sc
@@ -289,6 +289,31 @@ object contrib extends MillModule {
     def moduleDeps = Seq(scalalib)
   }
 
+  object scoverage extends MillModule {
+    def moduleDeps = Seq(scalalib, scoverage.api)
+
+    def testArgs = T {
+      val mapping = Map(
+        "MILL_SCOVERAGE_REPORT_WORKER_1_3_1" -> worker("1.3.1").compile().classes.path
+      )
+      scalalib.worker.testArgs() ++
+        scalalib.backgroundwrapper.testArgs() ++
+        (for ((k, v) <- mapping) yield s"-D$k=$v")
+    }
+
+    object api extends MillApiModule {
+      def moduleDeps = Seq(scalalib)
+    }
+
+    object worker extends Cross[WorkerModule]("1.3.1")
+
+    class WorkerModule(scoverageVersion: String) extends MillApiModule {
+      def moduleDeps = Seq(scoverage.api)
+
+      def ivyDeps = Agg(ivy"org.scoverage::scalac-scoverage-plugin:${scoverageVersion}")
+    }
+  }
+
   object buildinfo extends MillModule {
     def moduleDeps = Seq(scalalib)
     // why do I need this?
@@ -309,6 +334,11 @@ object contrib extends MillModule {
     def ivyDeps = Agg(ivy"org.flywaydb:flyway-core:5.2.4")
   }
 
+
+  object docker extends MillModule {
+    def moduleDeps = Seq(scalalib)
+  }
+
   object bloop extends MillModule {
     def moduleDeps = Seq(scalalib)
     def ivyDeps = Agg(
@@ -316,7 +346,6 @@ object contrib extends MillModule {
       ivy"com.lihaoyi::ujson-circe:0.7.4"
     )
   }
-
 }
 
 
@@ -439,7 +468,7 @@ def launcherScript(shellJvmArgs: Seq[String],
 }
 
 object dev extends MillModule{
-  def moduleDeps = Seq(scalalib, scalajslib, scalanativelib, contrib.scalapblib, contrib.tut)
+  def moduleDeps = Seq(scalalib, scalajslib, scalanativelib, contrib.scalapblib, contrib.tut, contrib.scoverage)
 
   def forkArgs =
     (