scala: upgrade 2.13 to .17

.github/workflows/ci.yml

@@ -83,7 +83,7 @@ jobs:
           distribution: temurin
           cache: sbt
       - uses: sbt/setup-sbt@v1
-      - run: sbt '++2.13.16 test'
+      - run: sbt '++2.13.17 test'
         shell: bash
   test:
     name: ${{ matrix.command }} ${{ matrix.java }}
@@ -96,7 +96,7 @@ jobs:
           # Test legacy Scala versions, where reporting API changed
           - "'++2.12.12! testAllNonNative'" # compiler version too old for Scala Native
           - "'++2.12.19 test'"
-          - "'++2.13.16 test'"
+          - "'++2.13.17 test'"
           # Minimal supported version
           - "'++3.3.6 test'"
           - "'++3.7.3 plugin/test'"

.mergify.yml

@@ -7,12 +7,12 @@ pull_request_rules:
       - check-success=Windows
       - check-success="'++2.12.12! testAllNonNative' 11"
       - check-success="'++2.12.19 test' 11"
-      - check-success="'++2.13.16 test' 11"
+      - check-success="'++2.13.17 test' 11"
       - check-success="'++3.3.6 test' 11"
       - check-success="scripted 11"
       - check-success="'++2.12.12! testAllNonNative' 17"
       - check-success="'++2.12.19 test' 17"
-      - check-success="'++2.13.16 test' 17"
+      - check-success="'++2.13.17 test' 17"
       - check-success="'++3.3.6 test' 17"
       - check-success="scripted 17"
     actions:

build.sbt

@@ -8,7 +8,7 @@ addCommandAlias(
 )
 
 def scala212 = "2.12.20"
-def scala213 = "2.13.16"
+def scala213 = "2.13.17"
 def scala3 = "3.3.6"
 def scala3ForSbt = "3.7.3"
 def scala2Versions = List(scala212, scala213)

mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt

@@ -1,5 +1,9 @@
 ThisBuild / scalaVersion := "2.12.20"
-ThisBuild / crossScalaVersions := List("2.12.20", "2.13.16", "3.3.6")
+ThisBuild / crossScalaVersions := List(
+  "2.12.20",
+  "2.13.17",
+  "3.3.6"
+)
 
 enablePlugins(MdocPlugin)
 mdocJS := Some(jsapp)

mdoc-sbt/src/sbt-test/sbt-mdoc/basic/project/plugins.sbt

@@ -1,2 +1,2 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % sys.props("plugin.version"))

mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test

@@ -1,6 +1,6 @@
 > ++2.12.19 mdoc
 > check
-> ++2.13.16 mdoc
+> ++2.13.17 mdoc
 > check
 > ++3.3.6 mdoc
 > check

mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt

@@ -1,3 +1,3 @@
-ThisBuild / scalaVersion := "2.13.16"
+ThisBuild / scalaVersion := "2.13.17"
 
 enablePlugins(MdocPlugin)

tests/unit/src/main/scala/tests/markdown/BaseMarkdownSuite.scala

@@ -61,7 +61,8 @@ abstract class BaseMarkdownSuite extends tests.BaseSuite {
       original: String,
       expected: String,
       settings: Settings = baseSettings(),
-      compat: Map[Compat.ScalaVersion, String] = Map.empty
+      compat: Map[Compat.ScalaVersion, String] = Map.empty,
+      expectedContains: Seq[String] = Seq.empty
   )(implicit loc: munit.Location): Unit = {
     test(name) {
       val reporter = newReporter()
@@ -75,10 +76,22 @@ abstract class BaseMarkdownSuite extends tests.BaseSuite {
         postProcessObtained
       )
 
-      assertNoDiff(
-        Compat(obtainedErrors, Map.empty, postProcessObtained),
-        Compat(expected, compat, postProcessExpected)
-      )
+      val obtained = Compat(obtainedErrors, Map.empty, postProcessObtained)
+      if (expected.nonEmpty || expectedContains.isEmpty)
+        assertNoDiff(
+          obtained,
+          Compat(expected, compat, postProcessExpected)
+        )
+      expectedContains.foreach { x =>
+        val exp = Compat(x, Map.empty, postProcessExpected)
+        assert(
+          obtained.contains(exp),
+          s"""|>>>>>>>> Expected:
+              |$obtained
+              |<<<<<<<< to contain:
+              |$exp""".stripMargin
+        )
+      }
     }
   }
 

tests/unit/src/test/scala/tests/imports/DependencySuite.scala

@@ -142,22 +142,24 @@ class DependencySuite extends BaseMarkdownSuite {
       |println(42)
       |```
       | """.stripMargin,
-    s"""|error: dep-error.md:4:13: Error downloading org.scalameta:not-exists_${BuildInfo.scalaVersion}:2.3.4
-        |<redacted user.home>
-        |  not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_${BuildInfo.scalaVersion}/2.3.4/not-exists_${BuildInfo.scalaVersion}-2.3.4.pom
-        |import $$dep.`org.scalameta:::not-exists:2.3.4`
-        |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-        |error: dep-error.md:3:49: Error downloading org.scalameta:foobar:1.2.1
-        |<redacted user.home>
-        |  not found: https://repo1.maven.org/maven2/org/scalameta/foobar/1.2.1/foobar-1.2.1.pom
-        |import $$dep.`org.scalameta::mmunit:2.3.4`, $$dep.`org.scalameta:foobar:1.2.1`
-        |                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-        |error: dep-error.md:3:13: Error downloading org.scalameta:mmunit_2.13:2.3.4
-        |<redacted user.home>
-        |  not found: https://repo1.maven.org/maven2/org/scalameta/mmunit_2.13/2.3.4/mmunit_2.13-2.3.4.pom
-        |import $$dep.`org.scalameta::mmunit:2.3.4`, $$dep.`org.scalameta:foobar:1.2.1`
-        |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-        |""".stripMargin
+    "",
+    expectedContains = Seq(
+      s"""|error: dep-error.md:4:13: Error downloading org.scalameta:not-exists_${BuildInfo.scalaVersion}:2.3.4
+          |<redacted user.home>
+          |  not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_${BuildInfo.scalaVersion}/2.3.4/not-exists_${BuildInfo.scalaVersion}-2.3.4.pom
+          |import $$dep.`org.scalameta:::not-exists:2.3.4`
+          |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^""".stripMargin,
+      s"""|error: dep-error.md:3:49: Error downloading org.scalameta:foobar:1.2.1
+          |<redacted user.home>
+          |  not found: https://repo1.maven.org/maven2/org/scalameta/foobar/1.2.1/foobar-1.2.1.pom
+          |import $$dep.`org.scalameta::mmunit:2.3.4`, $$dep.`org.scalameta:foobar:1.2.1`
+          |                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^""".stripMargin,
+      s"""|error: dep-error.md:3:13: Error downloading org.scalameta:mmunit_${BuildInfo.scalaBinaryVersion}:2.3.4
+          |<redacted user.home>
+          |  not found: https://repo1.maven.org/maven2/org/scalameta/mmunit_${BuildInfo.scalaBinaryVersion}/2.3.4/mmunit_${BuildInfo.scalaBinaryVersion}-2.3.4.pom
+          |import $$dep.`org.scalameta::mmunit:2.3.4`, $$dep.`org.scalameta:foobar:1.2.1`
+          |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^""".stripMargin
+    )
   )
 
   checkError(
@@ -170,22 +172,24 @@ class DependencySuite extends BaseMarkdownSuite {
       |println(42)
       |```
       | """.stripMargin,
-    s"""|error: dep-error-using.md:4:11: Error downloading org.scalameta:not-exists_2.13.16:2.3.4
-        |<redacted user.home>
-        |  not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_2.13.16/2.3.4/not-exists_2.13.16-2.3.4.pom
-        |//> using dep org.scalameta:::not-exists:2.3.4
-        |          ^
-        |error: dep-error-using.md:3:11: Error downloading org.scalameta:foobar:1.2.1
-        |<redacted user.home>
-        |  not found: https://repo1.maven.org/maven2/org/scalameta/foobar/1.2.1/foobar-1.2.1.pom
-        |//> using dep org.scalameta::mmunit:2.3.4 org.scalameta:foobar:1.2.1
-        |          ^
-        |error: dep-error-using.md:3:11: Error downloading org.scalameta:mmunit_2.13:2.3.4
-        |<redacted user.home>
-        |  not found: https://repo1.maven.org/maven2/org/scalameta/mmunit_2.13/2.3.4/mmunit_2.13-2.3.4.pom
-        |//> using dep org.scalameta::mmunit:2.3.4 org.scalameta:foobar:1.2.1
-        |          ^
-        |""".stripMargin
+    "",
+    expectedContains = Seq(
+      s"""|error: dep-error-using.md:4:11: Error downloading org.scalameta:not-exists_${BuildInfo.scalaVersion}:2.3.4
+          |<redacted user.home>
+          |  not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_${BuildInfo.scalaVersion}/2.3.4/not-exists_${BuildInfo.scalaVersion}-2.3.4.pom
+          |//> using dep org.scalameta:::not-exists:2.3.4
+          |          ^""".stripMargin,
+      s"""|error: dep-error-using.md:3:11: Error downloading org.scalameta:foobar:1.2.1
+          |<redacted user.home>
+          |  not found: https://repo1.maven.org/maven2/org/scalameta/foobar/1.2.1/foobar-1.2.1.pom
+          |//> using dep org.scalameta::mmunit:2.3.4 org.scalameta:foobar:1.2.1
+          |          ^""".stripMargin,
+      s"""|error: dep-error-using.md:3:11: Error downloading org.scalameta:mmunit_${BuildInfo.scalaBinaryVersion}:2.3.4
+          |<redacted user.home>
+          |  not found: https://repo1.maven.org/maven2/org/scalameta/mmunit_${BuildInfo.scalaBinaryVersion}/2.3.4/mmunit_${BuildInfo.scalaBinaryVersion}-2.3.4.pom
+          |//> using dep org.scalameta::mmunit:2.3.4 org.scalameta:foobar:1.2.1
+          |          ^""".stripMargin
+    )
   )
 
   checkError(

tests/unit/src/test/scala/tests/markdown/AsyncSuite.scala

@@ -69,12 +69,13 @@ class AsyncSuite extends BaseMarkdownSuite {
            |Await.result(Future(Thread.sleep(1000)), Duration("10ms"))
            |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
            |java.util.concurrent.TimeoutException: Future timed out after [10 milliseconds]
-           |	at scala.concurrent.impl.Promise$DefaultPromise.tryAwait0(Promise.scala:248)
-           |	at scala.concurrent.impl.Promise$DefaultPromise.result(Promise.scala:261)
-           |	at scala.concurrent.Await$.$anonfun$result$1(package.scala:201)
+           |	at scala.concurrent.Future$.timeoutError(Future.scala:581)
+           |	at scala.concurrent.impl.Promise$DefaultPromise.tryAwait0(Promise.scala:258)
+           |	at scala.concurrent.impl.Promise$DefaultPromise.result(Promise.scala:271)
+           |	at scala.concurrent.Await$.$anonfun$result$1(package.scala:208)
            |	at scala.concurrent.BlockContext$DefaultBlockContext$.blockOn(BlockContext.scala:62)
-           |	at scala.concurrent.Await$.result(package.scala:124)
-           |	at repl.MdocSession$MdocApp.<init>(timeout.md:11)
+           |	at scala.concurrent.Await$.result(package.scala:125)
+           |	at repl.MdocSession$MdocApp.<clinit>(timeout.md:11)
            |	at repl.MdocSession$.app(timeout.md:3)
            |""".stripMargin,
       Compat.Scala3 ->