Update munit to 1.0.0 (#2935)

* Update munit to 1.0.0

* Increase test suites' `munitTimeout` to 120s

* Adjust tests to use the latest `munit`

* Increase `munitTimeout` for `doc-tests`

* Increase `munitTimeout` for `GifTests` & `RunDockerTests`

---------

Co-authored-by: Piotr Chabelski <[email protected]>

Author: scala-steward

modules/build/src/test/scala/scala/build/tests/BuildTests.scala

@@ -596,7 +596,7 @@ abstract class BuildTests(server: Boolean) extends TestUtil.ScalaCliBuildSuite {
 
   test("cli dependency options shadowing using directives") {
     val usingDependency = "org.scalameta::munit::1.0.0-M1"
-    val cliDependency   = "org.scalameta::munit::0.7.29"
+    val cliDependency   = "org.scalameta::munit::1.0.0"
 
     val inputs = TestInputs(
       os.rel / "foo.scala" ->

modules/build/src/test/scala/scala/build/tests/TestUtil.scala

@@ -4,8 +4,12 @@ import scala.build.{Build, Positioned}
 import scala.build.options.{BuildOptions, Platform}
 import munit.Assertions.assertEquals
 
+import java.util.concurrent.TimeUnit
+import scala.concurrent.duration.FiniteDuration
+
 object TestUtil {
   abstract class ScalaCliBuildSuite extends munit.FunSuite {
+    override def munitTimeout = new FiniteDuration(120, TimeUnit.SECONDS)
     val testStartEndLogger = new Fixture[Unit]("files") {
       def apply(): Unit = ()
 

modules/docs-tests/src/test/scala/sclicheck/DocTests.scala

@@ -1,6 +1,11 @@
 package sclicheck
 
+import java.util.concurrent.TimeUnit
+
+import scala.concurrent.duration.FiniteDuration
+
 class DocTests extends munit.FunSuite {
+  override def munitTimeout = new FiniteDuration(240, TimeUnit.SECONDS)
   case class DocTestEntry(name: String, path: os.Path, depth: Int = Int.MaxValue)
 
   val docsRootPath: os.Path = os.pwd / "website" / "docs"

modules/docs-tests/src/test/scala/sclicheck/GifTests.scala

@@ -1,6 +1,11 @@
 package sclicheck
 
+import java.util.concurrent.TimeUnit
+
+import scala.concurrent.duration.FiniteDuration
+
 class GifTests extends munit.FunSuite {
+  override def munitTimeout = new FiniteDuration(360, TimeUnit.SECONDS)
 
   val scenariosDir =
     Option(System.getenv("SCALA_CLI_GIF_SCENARIOS")).map(os.Path(_, os.pwd)).getOrElse {

modules/generate-reference-doc/src/main/scala/scala/cli/doc/GenerateReferenceDoc.scala

@@ -5,7 +5,7 @@ import caseapp.core.Arg
 import caseapp.core.Scala3Helpers.*
 import caseapp.core.util.Formatter
 import dotty.tools.dotc.ScalacCommand
-import munit.internal.difflib.Diff
+import munit.diff.Diff
 import shapeless.tag
 
 import java.nio.charset.StandardCharsets

modules/integration/docker/src/test/scala/scala/cli/integration/RunDockerTests.scala

@@ -4,8 +4,11 @@ import com.eed3si9n.expecty.Expecty.expect
 
 import java.io.ByteArrayOutputStream
 import java.nio.charset.Charset
+import java.util.concurrent.TimeUnit
+import scala.concurrent.duration.{Duration, FiniteDuration}
 
 class RunDockerTests extends munit.FunSuite {
+  override def munitTimeout: Duration = new FiniteDuration(240, TimeUnit.SECONDS)
 
   lazy val imageName = Option(System.getenv("SCALA_CLI_IMAGE")).getOrElse {
     sys.error("SCALA_CLI_IMAGE not set")

modules/integration/src/test/scala/scala/cli/integration/ScalaCliSuite.scala

@@ -1,5 +1,9 @@
 package scala.cli.integration
 
+import java.util.concurrent.TimeUnit
+
+import scala.concurrent.duration.{Duration, FiniteDuration}
+
 abstract class ScalaCliSuite extends munit.FunSuite {
   val testStartEndLogger = new Fixture[Unit]("files") {
     def apply(): Unit = ()
@@ -19,6 +23,8 @@ abstract class ScalaCliSuite extends munit.FunSuite {
     }
   }
 
+  override def munitTimeout: Duration = new FiniteDuration(120, TimeUnit.SECONDS)
+
   override def munitFixtures: List[Fixture[Unit]] = List(testStartEndLogger)
   def group: ScalaCliSuite.TestGroup              = ScalaCliSuite.TestGroup.Third
 

modules/integration/src/test/scala/scala/cli/integration/TestTestDefinitions.scala

@@ -3,6 +3,7 @@ package scala.cli.integration
 import com.eed3si9n.expecty.Expecty.expect
 
 import scala.annotation.tailrec
+import scala.cli.integration.Constants.munitVersion
 
 abstract class TestTestDefinitions extends ScalaCliSuite with TestScalaVersionArgs {
   _: TestScalaVersion =>
@@ -13,7 +14,6 @@ abstract class TestTestDefinitions extends ScalaCliSuite with TestScalaVersionAr
   protected lazy val baseExtraOptions: Seq[String] = TestUtil.extraOptions ++ jvmOptions
   private lazy val extraOptions: Seq[String]       = scalaVersionArgs ++ baseExtraOptions
 
-  private val munitVersion = "1.0.0-M12"
   private val utestVersion = "0.8.3"
 
   def successfulTestInputs(directivesString: String =

project/deps.sc

@@ -157,7 +157,7 @@ object Deps {
   def metaconfigTypesafe =
     ivy"com.geirsson::metaconfig-typesafe-config:0.12.0"
       .exclude(("org.scala-lang", "scala-compiler"))
-  def munit                      = ivy"org.scalameta::munit:0.7.29"
+  def munit                      = ivy"org.scalameta::munit:1.0.0"
   def nativeTestRunner           = ivy"org.scala-native::test-runner:${Versions.scalaNative}"
   def nativeTools                = ivy"org.scala-native::tools:${Versions.scalaNative}"
   def osLib                      = ivy"com.lihaoyi::os-lib:0.10.2"