Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use latest versions of SBT junit test frameworks #3296

Merged
merged 4 commits into from
Aug 2, 2024
Merged

Use latest versions of SBT junit test frameworks #3296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc79771
Use latest versions of SBT junit test frameworks
lihaoyi Jul 29, 2024
24c3b5b
Update TestModule.scala
lihaoyi Jul 29, 2024
236f0e0
.
lihaoyi Jul 29, 2024
4fc7fdd
Merge branch 'main' into lihaoyi-patch-10
lefou Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/basicjava/1-simple/build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions scalalib/src/mill/scalalib/TestModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}

Expand All @@ -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.11.4")
}
}

Expand Down