diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-08 18:58:55 -0700 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-08 20:36:54 -0700 |
commit | 44ed2e53f0d66f62988c532f5a8ceb056bb74d65 (patch) | |
tree | 7ea7518ce7211f2be5cbb1347f5c0567548368e1 /scalalib/src | |
parent | eb04366771e23bc4a8f574ec7317f10e82fbdc6f (diff) | |
download | mill-44ed2e53f0d66f62988c532f5a8ceb056bb74d65.tar.gz mill-44ed2e53f0d66f62988c532f5a8ceb056bb74d65.tar.bz2 mill-44ed2e53f0d66f62988c532f5a8ceb056bb74d65.zip |
First pass at a Caffeine integration build now works (only on Java 9 tho)
Diffstat (limited to 'scalalib/src')
-rw-r--r-- | scalalib/src/mill/scalalib/MiscModule.scala | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/scalalib/src/mill/scalalib/MiscModule.scala b/scalalib/src/mill/scalalib/MiscModule.scala index b355bb50..0e8bde3e 100644 --- a/scalalib/src/mill/scalalib/MiscModule.scala +++ b/scalalib/src/mill/scalalib/MiscModule.scala @@ -50,19 +50,28 @@ trait CrossScalaModule extends ScalaModule with CrossModuleBase{ outer => } } -trait SbtModule extends ScalaModule { outer => +trait MavenTests extends TestModule{ + override def sources = T.sources( + millSourcePath / 'src / 'test / 'scala, + millSourcePath / 'src / 'test / 'java + ) + override def resources = T.sources{ millSourcePath / 'src / 'test / 'resources } +} +trait MavenModule extends JavaModule{outer => + override def sources = T.sources( millSourcePath / 'src / 'main / 'scala, millSourcePath / 'src / 'main / 'java ) override def resources = T.sources{ millSourcePath / 'src / 'main / 'resources } - trait Tests extends super.Tests { + trait Tests extends super.Tests with MavenTests { + override def millSourcePath = outer.millSourcePath + } +} + +trait SbtModule extends MavenModule with ScalaModule{ outer => + trait Tests extends super.Tests with MavenTests { override def millSourcePath = outer.millSourcePath - override def sources = T.sources( - millSourcePath / 'src / 'test / 'scala, - millSourcePath / 'src / 'test / 'java - ) - override def resources = T.sources{ millSourcePath / 'src / 'test / 'resources } } } |