fix cross sbt module tests

com-lihaoyi · Apr 15, 2018 · 20b41ec · 20b41ec
1 parent a145abc
commit 20b41ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/integration/test/resources/play-json/build.sc b/integration/test/resources/play-json/build.sc
@@ -143,7 +143,7 @@ abstract class PlayJson(val platformSegment: String) extends PlayJsonModule {
 }
 
 object playJsonJvm extends Cross[PlayJsonJvm](ScalaVersions:_*)
-class PlayJsonJvm(val crossScalaVersion: String) extends PlayJson("jvm") {
+class PlayJsonJvm(val crossScalaVersion: String) extends PlayJson("jvm") { outer =>
   def moduleDeps = Seq(playFunctionalJvm(crossScalaVersion))
 
   val jacksonVersion = "2.9.3"
@@ -168,7 +168,7 @@ class PlayJsonJvm(val crossScalaVersion: String) extends PlayJson("jvm") {
       )
 
     def sources = {
-      val docSpecs = ls.rec(millSourcePath / up / "docs" / "manual" / "working" / "scalaGuide").filter(_.isDir).filter(_.last=="code").map(PathRef(_))
+      val docSpecs = ls.rec(outer.millSourcePath / up / "docs" / "manual" / "working" / "scalaGuide").filter(_.isDir).filter(_.last=="code").map(PathRef(_))
       T.sources(
         docSpecs ++
         Seq(
@@ -324,7 +324,7 @@ object release extends Module {
 
   implicit val wd = pwd
 
-  val versionFile = wd / "version.sc"
+  val versionFile = wd / "playJsonVersion.sc"
 
   private val ReleaseVersion = raw"""(\d+)\.(\d+)\.(\d+)""".r
   private val MinorSnapshotVersion = raw"""(\d+)\.(\d+)\.(\d+)-SNAPSHOT""".r

diff --git a/scalalib/src/mill/scalalib/MiscModule.scala b/scalalib/src/mill/scalalib/MiscModule.scala
@@ -86,12 +86,12 @@ trait CrossSbtModule extends SbtModule with CrossModuleBase{ outer =>
 
   }
   trait Tests extends super.Tests {
-    override def millSourcePath = outer.millSourcePath
+    override def millSourcePath = outer.millSourcePath / 'src / 'test
     override def sources = T.sources{
       super.sources() ++
       CrossModuleBase.scalaVersionPaths(
         crossScalaVersion,
-        s => millSourcePath / 'src / 'test / s"scala-$s"
+        s => millSourcePath / s"scala-$s"
       )
     }
   }