Cleanup setup/use of junit-interface

build.mill

@@ -156,7 +156,6 @@ object Deps {
   val jna = mvn"net.java.dev.jna:jna:${jnaVersion}"
   val jnaPlatform = mvn"net.java.dev.jna:jna-platform:${jnaVersion}"
 
-  val junitInterface = mvn"com.github.sbt:junit-interface:0.13.3"
   val commonsIo = mvn"commons-io:commons-io:2.18.0"
   val log4j2Core = mvn"org.apache.logging.log4j:log4j-core:2.24.3"
   val osLib = mvn"com.lihaoyi::os-lib:0.11.5-M2"
@@ -240,6 +239,7 @@ object Deps {
     val dokkaCli = mvn"org.jetbrains.dokka:dokka-cli:$dokkaVersion"
     val errorProneCore = mvn"com.google.errorprone:error_prone_core:2.31.0"
     val freemarker = mvn"org.freemarker:freemarker:2.3.34"
+    val junitInterface = mvn"com.github.sbt:junit-interface:0.13.3"
     val jupiterInterface = mvn"com.github.sbt.junit:jupiter-interface:0.13.3"
     val kotestJvm =
       mvn"io.kotest:kotest-framework-multiplatform-plugin-embeddable-compiler-jvm:5.9.1"
@@ -251,7 +251,6 @@ object Deps {
     val palantirFormat = mvn"com.palantir.javaformat:palantir-java-format:2.51.0"
     val proguard = mvn"com.guardsquare:proguard-base:7.7.0"
     val revApi = mvn"org.revapi:revapi-standalone:0.12.0"
-    val sbtTestInterface = mvn"com.github.sbt:junit-interface:0.13.2"
 
     def all = Seq(
       detektCli,
@@ -260,6 +259,7 @@ object Deps {
       dokkaCli,
       errorProneCore,
       freemarker,
+      junitInterface,
       jupiterInterface,
       kotestJvm,
       kotlinxHtmlJvm,
@@ -269,8 +269,7 @@ object Deps {
       ktlint,
       palantirFormat,
       proguard,
-      revApi,
-      sbtTestInterface
+      revApi
     )
   }
 

contrib/package.mill

@@ -48,7 +48,7 @@ object `package` extends RootModule {
     def compileMvnDeps = Agg(build.Deps.testng)
     def runMvnDeps = Agg(build.Deps.testng)
     def testModuleDeps: Seq[JavaModule] = super.testModuleDeps ++ Seq(build.libs.scalalib)
-    def docJar: T[PathRef] = super[JavaModule].docJar
+    def docJar: T[PathRef] = super[JavaModule].docJar()
   }
 
   object twirllib extends ContribModule {

core/constants/package.mill

@@ -16,6 +16,6 @@ object `package` extends build.MillPublishJavaModule with BuildInfo {
   )
 
   object test extends JavaTests with TestModule.Junit4 {
-    def mvnDeps = Agg(build.Deps.junitInterface, build.Deps.commonsIo)
+    def mvnDeps = Agg(build.Deps.commonsIo)
   }
 }

libs/scalalib/package.mill

@@ -75,9 +75,14 @@ object `package` extends build.MillStableScalaModule {
       BuildInfo.Value("millVersion", build.millVersion(), "Mill version."),
       BuildInfo.Value(
         "sbtTestInterface",
-        Dep.unparse(build.Deps.RuntimeDeps.sbtTestInterface).get,
+        Dep.unparse(build.Deps.sbtTestInterface).get,
         "Dependency sbt-test-interface"
       ),
+      BuildInfo.Value(
+        "junitInterface",
+        Dep.unparse(build.Deps.RuntimeDeps.junitInterface).get,
+        "Dependency to junit-interface"
+      ),
       BuildInfo.Value(
         "jupiterInterface",
         Dep.unparse(build.Deps.RuntimeDeps.jupiterInterface).get,

runner/server/client/package.mill

@@ -20,6 +20,6 @@ object `package` extends build.MillPublishJavaModule with BuildInfo {
   def moduleDeps = Seq(build.core.constants)
 
   object test extends JavaTests with TestModule.Junit4 {
-    def mvnDeps = Agg(build.Deps.junitInterface, build.Deps.commonsIo)
+    def mvnDeps = Agg(build.Deps.commonsIo)
   }
 }