From fc7977105867dc6574712eb2877233152608ee1c Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 29 Jul 2024 16:43:17 +0800 Subject: [PATCH 1/3] Use latest versions of SBT junit test frameworks --- scalalib/src/mill/scalalib/TestModule.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scalalib/src/mill/scalalib/TestModule.scala b/scalalib/src/mill/scalalib/TestModule.scala index 4b539b463aa..4f458f9f13b 100644 --- a/scalalib/src/mill/scalalib/TestModule.scala +++ b/scalalib/src/mill/scalalib/TestModule.scala @@ -256,7 +256,7 @@ object TestModule { trait Junit4 extends TestModule { override def testFramework: T[String] = "com.novocode.junit.JUnitFramework" override def ivyDeps: T[Agg[Dep]] = T { - super.ivyDeps() ++ Agg(ivy"com.novocode:junit-interface:0.11") + super.ivyDeps() ++ Agg(ivy"com.github.sbt:junit-interface:0.13.2") } } @@ -265,9 +265,9 @@ object TestModule { * You may want to provide the junit dependency explicitly to use another version. */ trait Junit5 extends TestModule { - override def testFramework: T[String] = "net.aichler.jupiter.api.JupiterFramework" + override def testFramework: T[String] = "com.github.sbt.junit.jupiter.api.JupiterFramework" override def ivyDeps: T[Agg[Dep]] = T { - super.ivyDeps() ++ Agg(ivy"net.aichler:jupiter-interface:0.9.0") + super.ivyDeps() ++ Agg(ivy"com.github.sbt.junit:jupiter-interface:0.1.4") } } From 24c3b5bcf3e4d07e013f4d269215cdfa011e4cf3 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 29 Jul 2024 17:02:18 +0800 Subject: [PATCH 2/3] Update TestModule.scala --- scalalib/src/mill/scalalib/TestModule.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scalalib/src/mill/scalalib/TestModule.scala b/scalalib/src/mill/scalalib/TestModule.scala index 4f458f9f13b..253ea1b5450 100644 --- a/scalalib/src/mill/scalalib/TestModule.scala +++ b/scalalib/src/mill/scalalib/TestModule.scala @@ -267,7 +267,7 @@ object TestModule { trait Junit5 extends TestModule { override def testFramework: T[String] = "com.github.sbt.junit.jupiter.api.JupiterFramework" override def ivyDeps: T[Agg[Dep]] = T { - super.ivyDeps() ++ Agg(ivy"com.github.sbt.junit:jupiter-interface:0.1.4") + super.ivyDeps() ++ Agg(ivy"com.github.sbt.junit:jupiter-interface:0.11.4") } } From 236f0e0ae3c7fe10a2dd626835e15ba9417f2b16 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 29 Jul 2024 21:45:46 +0800 Subject: [PATCH 3/3] . --- example/basicjava/1-simple/build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/basicjava/1-simple/build.sc b/example/basicjava/1-simple/build.sc index 6526bc27cdd..acdc66126a2 100644 --- a/example/basicjava/1-simple/build.sc +++ b/example/basicjava/1-simple/build.sc @@ -72,7 +72,7 @@ error: argument -t/--text is required ... Test foo.FooTest.testEscaping finished, ... Test foo.FooTest.testSimple finished, ... -Test run finished: 0 failed, 0 ignored, 2 total, ... +Test run foo.FooTest finished: 0 failed, 0 ignored, 2 total, ... > ./mill assembly # bundle classfiles and libraries into a jar for deployment