Skip to content

Commit

Permalink
fixes #201, make test project root at src/test for sbt and maven modules
Browse files Browse the repository at this point in the history
  • Loading branch information
rockjam committed Apr 15, 2018
1 parent e87aa2d commit ad7666f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions scalalib/src/mill/scalalib/MiscModule.scala
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ trait CrossScalaModule extends ScalaModule with CrossModuleBase{ outer =>

trait MavenTests extends TestModule{
override def sources = T.sources(
millSourcePath / 'src / 'test / 'scala,
millSourcePath / 'src / 'test / 'java
millSourcePath / 'scala,
millSourcePath / 'java
)
override def resources = T.sources{ millSourcePath / 'src / 'test / 'resources }
}
Expand All @@ -65,13 +65,13 @@ trait MavenModule extends JavaModule{outer =>
)
override def resources = T.sources{ millSourcePath / 'src / 'main / 'resources }
trait Tests extends super.Tests with MavenTests {
override def millSourcePath = outer.millSourcePath
override def millSourcePath = outer.millSourcePath / 'src / 'test
}
}

trait SbtModule extends MavenModule with ScalaModule{ outer =>
trait Tests extends super.Tests with MavenTests {
override def millSourcePath = outer.millSourcePath
override def millSourcePath = outer.millSourcePath / 'src / 'test
}
}

Expand Down

0 comments on commit ad7666f

Please sign in to comment.