Manage test framework dependencies in TestModule traits

example/androidlib/java/1-hello-world/build.mill

@@ -33,10 +33,7 @@ object app extends AndroidAppModule {
   override def androidVirtualDeviceIdentifier: String = "java-test"
 
   object test extends AndroidAppTests with TestModule.Junit4 {
-    def testFramework = "com.novocode.junit.JUnitFramework"
-    def mvnDeps = super.mvnDeps() ++ Seq(
-      mvn"junit:junit:4.13.2"
-    )
+    def junit4Version = "4.13.2"
   }
 
   object it extends AndroidAppInstrumentedTests with AndroidTestModule.AndroidJUnit {

example/androidlib/java/4-sum-lib-java/build.mill

@@ -71,12 +71,7 @@ object app extends AndroidAppModule {
   )
 
   object test extends AndroidAppTests with TestModule.Junit4 {
-    def testFramework = "com.novocode.junit.JUnitFramework"
-
-    def mvnDeps = super.mvnDeps() ++ Seq(
-      mvn"junit:junit:4.13.2"
-    )
-
+    def junit4Version = "4.13.2"
   }
 }
 

example/androidlib/kotlin/1-hello-kotlin/build.mill

@@ -37,9 +37,7 @@ object app extends AndroidAppKotlinModule {
   override def androidEmulatorPort: String = "5556"
 
   object test extends AndroidAppKotlinTests with TestModule.Junit4 {
-    def mvnDeps = super.mvnDeps() ++ Seq(
-      mvn"junit:junit:4.13.2"
-    )
+    def junit4Version = "4.13.2"
   }
 
   object it extends AndroidAppKotlinInstrumentedTests with AndroidTestModule.AndroidJUnit {

example/androidlib/kotlin/4-sum-lib-kotlin/build.mill

@@ -45,9 +45,7 @@ object lib extends AndroidLibKotlinModule with PublishModule {
   def androidReleaseKeyStorePass: T[Option[String]] = Task { Some("MillBuildTool") }
 
   object test extends AndroidLibKotlinTests with TestModule.Junit4 {
-    def mvnDeps = super.mvnDeps() ++ Agg(
-      mvn"junit:junit:4.13.2"
-    )
+    def junit4Version = "4.13.2"
   }
 
 }
@@ -73,10 +71,7 @@ object app extends AndroidAppKotlinModule {
   )
 
   object test extends AndroidAppKotlinTests with TestModule.Junit4 {
-    def testFramework = "com.novocode.junit.JUnitFramework"
-    def mvnDeps = super.mvnDeps() ++ Agg(
-      mvn"junit:junit:4.13.2"
-    )
+    def junit4Version = "4.13.2"
   }
 }
 

example/scalalib/testing/1-test-suite/build.mill

@@ -3,7 +3,7 @@ package build
 import mill._, scalalib._
 
 object foo extends ScalaModule {
-  def scalaVersion = "2.13.8"
+  def scalaVersion = "2.13.15"
   object test extends ScalaTests {
     def mvnDeps = Seq(mvn"com.lihaoyi::utest:0.8.5")
     def testFramework = "utest.runner.Framework"
@@ -55,6 +55,7 @@ compiling 2 ... source...
 // * `TestModule.ScalaTest`, using https://github.com/scalatest/scalatest[ScalaTest]
 // * `TestModule.Specs2`, using https://github.com/etorreborre/specs2[Specs2]
 // * `TestModule.Utest`, using https://github.com/com-lihaoyi/utest[uTest]
+// * `TestModule.Waever`, using https://github.com/disneystreaming/weaver-test[Weaver]
 // * `TestModule.ZioTest`, using https://zio.dev/reference/test/[ZioTest]
 //
 // Each testing framework has their own flags and configuration options that are
@@ -63,10 +64,10 @@ compiling 2 ... source...
 //
 //// SNIPPET:BUILD2
 object bar extends ScalaModule {
-  def scalaVersion = "2.13.8"
+  def scalaVersion = "2.13.15"
 
   object test extends ScalaTests with TestModule.Utest {
-    def mvnDeps = Seq(mvn"com.lihaoyi::utest:0.8.5")
+    def utestVersion = "0.8.5"
   }
 }
 

example/scalalib/testing/2-test-deps/build.mill

@@ -17,19 +17,17 @@ object qux extends ScalaModule {
   def scalaVersion = "2.13.8"
   def moduleDeps = Seq(baz)
 
-  object test extends ScalaTests {
-    def mvnDeps = Seq(mvn"com.lihaoyi::utest:0.8.5")
-    def testFramework = "utest.runner.Framework"
+  object test extends ScalaTests with TestModule.Utest {
+    def utestVersion = "0.8.5"
     def moduleDeps = super.moduleDeps ++ Seq(baz.test)
   }
 }
 
 object baz extends ScalaModule {
   def scalaVersion = "2.13.8"
 
-  object test extends ScalaTests {
-    def mvnDeps = Seq(mvn"com.lihaoyi::utest:0.8.5")
-    def testFramework = "utest.runner.Framework"
+  object test extends ScalaTests with TestModule.Utest {
+    def utestVersion = "0.8.5"
   }
 }
 

example/scalalib/testing/3-integration-suite/build.mill

@@ -10,10 +10,10 @@ object qux extends ScalaModule {
   def scalaVersion = "2.13.8"
 
   object test extends ScalaTests with TestModule.Utest {
-    def mvnDeps = Seq(mvn"com.lihaoyi::utest:0.8.5")
+    def utestVersion = "0.8.5"
   }
   object integration extends ScalaTests with TestModule.Utest {
-    def mvnDeps = Seq(mvn"com.lihaoyi::utest:0.8.5")
+    def utestVersion = "0.8.5"
   }
 }
 //// SNIPPET:END

example/scalalib/testing/4-test-parallel/build.mill

@@ -12,9 +12,8 @@ import mill._, scalalib._
 
 object foo extends ScalaModule {
   def scalaVersion = "2.13.8"
-  object test extends ScalaTests {
-    def mvnDeps = Seq(mvn"com.lihaoyi::utest:0.8.5")
-    def testFramework = "utest.runner.Framework"
+  object test extends ScalaTests with TestModule.Utest {
+    def utestVersion = "0.8.5"
 
     def testParallelism = true
   }
@@ -24,7 +23,7 @@ object foo extends ScalaModule {
 
 /** Usage
 
-> mill -j 3 foo.test
+> mill --jobs 3 foo.test
 
 > find out/foo/test/testForked.dest
 ...

example/scalalib/testing/5-test-grouping/build.mill

@@ -9,9 +9,9 @@ import mill._, scalalib._
 
 object foo extends ScalaModule {
   def scalaVersion = "2.13.8"
-  object test extends ScalaTests {
-    def mvnDeps = Seq(mvn"com.lihaoyi::utest:0.8.5")
-    def testFramework = "utest.runner.Framework"
+  object test extends ScalaTests with TestModule.Utest {
+    def utestVersion = "0.8.5"
+
     def testForkGrouping = discoveredTestClasses().grouped(1).toSeq
     def testParallelism = false
   }

example/scalalib/testing/6-test-group-parallel/build.mill

@@ -6,9 +6,8 @@ import mill._, scalalib._
 
 object foo extends ScalaModule {
   def scalaVersion = "2.13.8"
-  object test extends ScalaTests {
-    def mvnDeps = Seq(mvn"com.lihaoyi::utest:0.8.5")
-    def testFramework = "utest.runner.Framework"
+  object test extends ScalaTests with TestModule.Utest {
+    def utestVersion = "0.8.5"
 
     // Group tests by GroupX and GroupY
     def testForkGrouping =
@@ -23,7 +22,7 @@ object foo extends ScalaModule {
 
 /** Usage
 
-> mill -j 4 foo.test
+> mill --jobs 4 foo.test
 
 > find out/foo/test/testForked.dest
 ...

example/scalalib/web/1-todo-webapp/build.mill

@@ -8,9 +8,7 @@ object `package` extends RootModule with ScalaModule {
     mvn"com.lihaoyi::scalatags:0.13.1"
   )
 
-  object test extends ScalaTests {
-    def testFramework = "utest.runner.Framework"
-
+  object test extends ScalaTests with TestModule.Utest {
     def mvnDeps = Seq(
       mvn"com.lihaoyi::utest::0.8.5",
       mvn"com.lihaoyi::requests::0.6.9"

example/scalalib/web/2-webapp-cache-busting/build.mill

@@ -25,8 +25,7 @@ object `package` extends RootModule with ScalaModule {
     Seq(PathRef(Task.dest))
   }
 
-  object test extends ScalaTests {
-    def testFramework = "utest.runner.Framework"
+  object test extends ScalaTests with TestModule.Utest {
     def mvnDeps = Seq(
       mvn"com.lihaoyi::utest::0.8.5",
       mvn"com.lihaoyi::requests::0.6.9"

example/scalalib/web/3-todo-http4s/build.mill

@@ -10,9 +10,7 @@ object `package` extends RootModule with ScalaModule {
     mvn"io.circe::circe-generic::0.14.10"
   )
 
-  object test extends ScalaTests {
-    def testFramework = "utest.runner.Framework"
-
+  object test extends ScalaTests with TestModule.Utest {
     def mvnDeps = Seq(
       mvn"com.lihaoyi::utest::0.8.5",
       mvn"org.typelevel::cats-effect-testing-utest::1.6.0",

example/scalalib/web/4-scalajs-module/build.mill

@@ -5,9 +5,8 @@ object foo extends ScalaJSModule {
   def scalaVersion = "2.13.14"
   def scalaJSVersion = "1.16.0"
   def mvnDeps = Seq(mvn"com.lihaoyi::scalatags::0.13.1")
-  object test extends ScalaJSTests {
-    def mvnDeps = Seq(mvn"com.lihaoyi::utest::0.8.5")
-    def testFramework = "utest.runner.Framework"
+  object test extends ScalaJSTests with TestModule.Utest {
+    def utestVersion = "0.8.5"
   }
 }
 

example/scalalib/web/5-webapp-scalajs/build.mill

@@ -19,11 +19,9 @@ object `package` extends RootModule with ScalaModule {
     super.resources() ++ Seq(PathRef(Task.dest))
   }
 
-  object test extends ScalaTests {
-    def testFramework = "utest.runner.Framework"
-
+  object test extends ScalaTests with TestModule.Utest {
+    def utestVersion = "0.8.5"
     def mvnDeps = Seq(
-      mvn"com.lihaoyi::utest::0.8.5",
       mvn"com.lihaoyi::requests::0.6.9"
     )
   }

example/scalalib/web/6-webapp-scalajs-shared/build.mill

@@ -22,9 +22,8 @@ object `package` extends RootModule with AppScalaModule {
   }
 
   object test extends ScalaTests with TestModule.Utest {
-
+    def utestVersion = "0.8.5"
     def mvnDeps = Seq(
-      mvn"com.lihaoyi::utest::0.8.5",
       mvn"com.lihaoyi::requests::0.6.9"
     )
   }

example/scalalib/web/7-cross-version-platform-publishing/build.mill

@@ -19,9 +19,8 @@ trait FooModule extends Cross.Module[String] {
     def mvnDeps = Seq(mvn"com.lihaoyi::scalatags::0.13.1")
   }
 
-  trait FooTestModule extends TestModule {
-    def mvnDeps = Seq(mvn"com.lihaoyi::utest::0.8.5")
-    def testFramework = "utest.runner.Framework"
+  trait FooTestModule extends TestModule.Utest {
+    def utestVersion = "0.8.5"
   }
 
   trait SharedJS extends Shared with ScalaJSModule {

example/scalalib/web/8-cross-platform-version-publishing/build.mill

@@ -16,9 +16,8 @@ trait Shared extends CrossScalaModule with PlatformScalaModule with PublishModul
   def mvnDeps = Seq(mvn"com.lihaoyi::scalatags::0.13.1")
 }
 
-trait SharedTestModule extends TestModule {
-  def mvnDeps = Seq(mvn"com.lihaoyi::utest::0.8.5")
-  def testFramework = "utest.runner.Framework"
+trait SharedTestModule extends TestModule.Utest {
+  def utestVersion = "0.8.5"
 }
 
 trait SharedJS extends Shared with ScalaJSModule {

example/thirdparty/fansi/build.mill

@@ -20,7 +20,7 @@ trait FansiModule extends PublishModule with CrossScalaModule with PlatformScala
   def mvnDeps = Seq(mvn"com.lihaoyi::sourcecode::0.3.0")
 
   trait FansiTests extends ScalaTests with TestModule.Utest {
-    def mvnDeps = Seq(mvn"com.lihaoyi::utest::0.8.5")
+    def utestVersion = "0.8.5"
   }
 }
 

example/thirdparty/jimfs/build.mill

@@ -28,16 +28,13 @@ object jimfs extends PublishModule with MavenModule {
 
   def javacOptions = Seq("-processor", "com.google.auto.service.processor.AutoServiceProcessor")
 
-  object test extends MavenTests {
+  object test extends MavenTests with TestModule.Junit4 {
+    def junit4Version = "4.13.2"
     def mvnDeps = sharedCompileMvnDeps() ++ Seq(
-      mvn"junit:junit:4.13.2",
       mvn"com.google.guava:guava-testlib:31.1-android",
       mvn"com.google.truth:truth:1.1.3",
-      mvn"com.github.sbt:junit-interface:0.13.2",
       mvn"com.ibm.icu:icu4j:73.1"
     )
-
-    def testFramework = "com.novocode.junit.JUnitFramework"
   }
 }
 

example/thirdparty/netty/build.mill

@@ -15,7 +15,6 @@ trait NettyBaseModule extends MavenModule {
 }
 trait NettyBaseTestSuiteModule extends NettyBaseModule with TestModule.Junit5 {
   def testSandboxWorkingDir = false
-  def testFramework = "com.github.sbt.junit.jupiter.api.JupiterFramework"
   def mvnDeps = Seq(
     mvn"com.github.sbt.junit:jupiter-interface:0.11.2",
     mvn"org.hamcrest:hamcrest-library:1.3",

libs/scalajslib/test/src/mill/scalajslib/CompileLinkTests.scala

@@ -44,15 +44,13 @@ object CompileLinkTests extends TestSuite {
       )
 
       object `test-utest` extends ScalaJSTests with TestModule.Utest {
-        override def sources = Task.Sources { this.moduleDir / "src/utest" }
-        val utestVersion = if (JvmWorkerUtil.isScala3(crossScalaVersion)) "0.7.7" else "0.7.5"
-        override def mvnDeps = Seq(
-          mvn"com.lihaoyi::utest::$utestVersion"
-        )
+        override def sources = Task.Sources { "src/utest" }
+        override def utestVersion =
+          if (JvmWorkerUtil.isScala3(crossScalaVersion)) "0.7.7" else "0.7.5"
       }
 
       object `test-scalatest` extends ScalaJSTests with TestModule.ScalaTest {
-        override def sources = Task.Sources { this.moduleDir / "src/scalatest" }
+        override def sources = Task.Sources { "src/scalatest" }
         override def mvnDeps = Seq(
           mvn"org.scalatest::scalatest::3.1.2"
         )

libs/scalajslib/test/src/mill/scalajslib/MultiModuleTests.scala

@@ -20,8 +20,7 @@ object MultiModuleTests extends TestSuite {
       override def moduleDeps = Seq(shared)
       override def mainClass = Some("Main")
       object test extends ScalaJSTests with TestModule.Utest {
-        override def mvnDeps =
-          Seq(mvn"com.lihaoyi::utest::${sys.props.getOrElse("TEST_UTEST_VERSION", ???)}")
+        override def utestVersion = sys.props.getOrElse("TEST_UTEST_VERSION", ???)
       }
     }
 

libs/scalajslib/test/src/mill/scalajslib/NodeJSConfigTests.scala

@@ -14,7 +14,7 @@ import scala.util.Properties
 object NodeJSConfigTests extends TestSuite {
   val scalaVersion = sys.props.getOrElse("TEST_SCALA_2_13_VERSION", ???)
   val scalaJSVersion = sys.props.getOrElse("TEST_SCALAJS_VERSION", ???)
-  val utestVersion = sys.props.getOrElse("TEST_UTEST_VERSION", ???)
+  val testUtestVersion = sys.props.getOrElse("TEST_UTEST_VERSION", ???)
   val nodeArgsEmpty = List()
   val nodeArgs2G = List("--max-old-space-size=2048")
   val nodeArgs4G = List("--max-old-space-size=4096")
@@ -44,9 +44,7 @@ object NodeJSConfigTests extends TestSuite {
 
       object `test-utest` extends ScalaJSTests with TestModule.Utest {
         override def sources = Task.Sources { this.moduleDir / "src/utest" }
-        override def mvnDeps = Seq(
-          mvn"com.lihaoyi::utest::$utestVersion"
-        )
+        override def utestVersion = testUtestVersion
         override def jsEnvConfig = Task { JsEnvConfig.NodeJs(args = nodeArgs) }
       }
     }