Implement a `SbtScalaModule` helper trait, to conveniently set up the default source/test locations for builds using SBT project layout

Also split out plain-old-Scala-logic in `Lib` from inheritable traits in `ScalaModule`, since `ScalaModule` was getting a bit unwieldy

2 files changed, 2 insertions, 8 deletions

diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala b/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala
index 7c10cb6b..f233fdf1 100644
--- a/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala
+++ b/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala
@@ -10,24 +10,21 @@ import mill.util.JsonFormatters._
 object AcyclicBuild{
   val acyclic =
     for(crossVersion <- Cross("2.10.6", "2.11.8", "2.12.3", "2.12.4"))
-    yield new ScalaModule{outer =>
+    yield new SbtScalaModule{outer =>
       def basePath = AcyclicTests.workspacePath
       def organization = "com.lihaoyi"
       def name = "acyclic"
 
       def version = "0.1.7"
-      override def sources = basePath/'src/'main/'scala
       def scalaVersion = crossVersion
       override def ivyDeps = Seq(
         Dep.Java("org.scala-lang", "scala-compiler", scalaVersion())
       )
       object test extends this.Tests{
-        def basePath = AcyclicTests.workspacePath
         override def forkWorkingDir = pwd/'scalaplugin/'src/'test/'resource/'acyclic
         override def ivyDeps = Seq(
           Dep("com.lihaoyi", "utest", "0.6.0")
         )
-        override def sources = basePath/'src/'test/'scala
         def testFramework = "utest.runner.Framework"
       }
     }
diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/BetterFilesTests.scala b/scalaplugin/src/test/scala/mill/scalaplugin/BetterFilesTests.scala
index f2f3a832..c59beca4 100644
--- a/scalaplugin/src/test/scala/mill/scalaplugin/BetterFilesTests.scala
+++ b/scalaplugin/src/test/scala/mill/scalaplugin/BetterFilesTests.scala
@@ -9,9 +9,8 @@ import utest._
 import mill.util.JsonFormatters._
 
 object BetterFilesBuild{
-  trait BetterFilesModule extends ScalaModule{ outer =>
+  trait BetterFilesModule extends SbtScalaModule{ outer =>
     def scalaVersion = "2.12.4"
-    override def sources = basePath/'src/'main/'scala
     override def scalacOptions = Seq(
       "-deprecation",                      // Emit warning and location for usages of deprecated APIs.
       "-encoding", "utf-8",                // Specify character encoding used by source files.
@@ -64,9 +63,7 @@ object BetterFilesBuild{
       override def projectDeps =
         if (this == Core.test) Seq(Core)
         else Seq(outer, Core.test)
-      def basePath = outer.basePath
       override def ivyDeps = Seq(Dep("org.scalatest", "scalatest", "3.0.4"))
-      override def sources = basePath/'src/'test/'scala
       def testFramework = "org.scalatest.tools.Framework"
     }
   }