First pass at a Caffeine integration build now works (only on Java 9 tho)

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 }
   }
 }