chore: Bump Scala versions

scalameta · Mar 10, 2024 · d64ff0f · d64ff0f
1 parent cdbdae8
commit d64ff0f
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
         with:
           java-version: 11
           distribution: adopt
-      - run: sbt '++2.13.12 test'
+      - run: sbt '++2.13.13 test'
         shell: bash
   test:
     name: ${{ matrix.command }} ${{ matrix.java }}
@@ -54,10 +54,10 @@ jobs:
         command:
           # Test legacy Scala versions, where reporting API changed
           - "'++2.12.12! test'"
-          - "'++2.12.18 test'"
-          - "'++2.13.12 test'"
+          - "'++2.12.19 test'"
+          - "'++2.13.13 test'"
           # Minimal supported version
-          - "'++3.3.1 test'"
+          - "'++3.3.3 test'"
           - "scripted"
     steps:
       - uses: actions/checkout@v4

diff --git a/.mergify.yml b/.mergify.yml
@@ -6,14 +6,14 @@ pull_request_rules:
       - check-success=Website
       - check-success=Windows
       - check-success="'++2.12.12! test' adopt@1.11"
-      - check-success="'++2.12.18 test' adopt@1.11"
-      - check-success="'++2.13.12 test' adopt@1.11"
-      - check-success="'++3.3.0 test' adopt@1.11"
+      - check-success="'++2.12.19 test' adopt@1.11"
+      - check-success="'++2.13.13 test' adopt@1.11"
+      - check-success="'++3.3.3 test' adopt@1.11"
       - check-success="scripted adopt@1.11"
       - check-success="'++2.12.12! test' 17"
-      - check-success="'++2.12.18 test' 17"
-      - check-success="'++2.13.12 test' 17"
-      - check-success="'++3.3.0 test' 17"
+      - check-success="'++2.12.19 test' 17"
+      - check-success="'++2.13.13 test' 17"
+      - check-success="'++3.3.3 test' 17"
       - check-success=scripted 17
     actions:
       merge:

diff --git a/build.sbt b/build.sbt
@@ -1,8 +1,8 @@
 import scala.collection.mutable
 
-def scala212 = "2.12.18"
-def scala213 = "2.13.12"
-def scala3 = "3.3.1"
+def scala212 = "2.12.19"
+def scala213 = "2.13.13"
+def scala3 = "3.3.3"
 def scala2Versions = List(scala212, scala213)
 def allScalaVersions = scala2Versions :+ scala3
 

diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt
@@ -1,5 +1,5 @@
 ThisBuild / scalaVersion := "2.12.18"
-ThisBuild / crossScalaVersions := List("2.12.18", "2.13.12", "3.3.0", "3.3.1")
+ThisBuild / crossScalaVersions := List("2.12.19", "2.13.13", "3.3.3")
 
 enablePlugins(MdocPlugin)
 mdocJS := Some(jsapp)

diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/project/plugins.sbt b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.9.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % sys.props("plugin.version"))
diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test
@@ -1,10 +1,8 @@
-> ++2.12.18 mdoc
+> ++2.12.19 mdoc
 > check
-> ++2.13.12 mdoc
+> ++2.13.13 mdoc
 > check
-> ++3.3.0 mdoc
-> check
-> ++3.3.1 mdoc
+> ++3.3.3 mdoc
 > check
 > set mdocIn := (ThisBuild / baseDirectory).value
 -> mdoc
diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt b/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt
@@ -1,3 +1,3 @@
-ThisBuild / scalaVersion := "2.13.12"
+ThisBuild / scalaVersion := "2.13.13"
 
 enablePlugins(MdocPlugin)
diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/project/plugins.sbt b/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.9.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % sys.props("plugin.version"))
diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/build.sbt b/mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/build.sbt
@@ -1,5 +1,5 @@
 ThisBuild / scalaVersion := "2.12.18"
-ThisBuild / crossScalaVersions := List("2.12.18", "2.13.12", "3.0.1")
+ThisBuild / crossScalaVersions := List("2.12.18", "2.13.12", "3.3.3")
 
 enablePlugins(MdocPlugin)
 mdocJS := Some(jsapp)

diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/test b/mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/test
@@ -2,9 +2,7 @@
 > check
 > ++2.13.12 mdoc
 > check
-> ++3.3.0 mdoc
-> check
-> ++3.3.1 mdoc
+> ++3.3.3 mdoc
 > check
 > set mdocIn := (ThisBuild / baseDirectory).value
 -> mdoc
diff --git a/tests/unit/src/test/scala/tests/markdown/AsyncSuite.scala b/tests/unit/src/test/scala/tests/markdown/AsyncSuite.scala
@@ -29,8 +29,8 @@ class AsyncSuite extends BaseMarkdownSuite {
        |Await.result(Future(Thread.sleep(1000)), Duration("10ms"))
        |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
        |java.util.concurrent.TimeoutException: Futures timed out after [10 milliseconds]
-       |	at scala.concurrent.impl.Promise$DefaultPromise.ready(Promise.scala:259)
-       |	at scala.concurrent.impl.Promise$DefaultPromise.result(Promise.scala:263)
+       |	at scala.concurrent.impl.Promise$DefaultPromise.ready(Promise.scala:269)
+       |	at scala.concurrent.impl.Promise$DefaultPromise.result(Promise.scala:273)
        |	at scala.concurrent.Await$.$anonfun$result$1(package.scala:223)
        |	at scala.concurrent.BlockContext$DefaultBlockContext$.blockOn(BlockContext.scala:57)
        |	at scala.concurrent.Await$.result(package.scala:146)
@@ -51,6 +51,19 @@ class AsyncSuite extends BaseMarkdownSuite {
            |	at repl.MdocSession$MdocApp.<init>(timeout.md:11)
            |	at repl.MdocSession$.app(timeout.md:3)
            |""".stripMargin,
+      Compat.Full("2.12.12") ->
+        """|error: timeout.md:4:1: Futures timed out after [10 milliseconds]
+           |Await.result(Future(Thread.sleep(1000)), Duration("10ms"))
+           |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+           |java.util.concurrent.TimeoutException: Futures timed out after [10 milliseconds]
+           |	at scala.concurrent.impl.Promise$DefaultPromise.ready(Promise.scala:259)
+           |	at scala.concurrent.impl.Promise$DefaultPromise.result(Promise.scala:263)
+           |	at scala.concurrent.Await$.$anonfun$result$1(package.scala:223)
+           |	at scala.concurrent.BlockContext$DefaultBlockContext$.blockOn(BlockContext.scala:57)
+           |	at scala.concurrent.Await$.result(package.scala:146)
+           |	at repl.MdocSession$MdocApp.<init>(timeout.md:11)
+           |	at repl.MdocSession$.app(timeout.md:3)
+           |""".stripMargin,
       Compat.Scala213 ->
         """|error: timeout.md:4:1: Future timed out after [10 milliseconds]
            |Await.result(Future(Thread.sleep(1000)), Duration("10ms"))

diff --git a/tests/unit/src/test/scala/tests/markdown/NamespaceHygieneSuite.scala b/tests/unit/src/test/scala/tests/markdown/NamespaceHygieneSuite.scala
@@ -33,7 +33,7 @@ class NamespaceHygieneSuite extends BaseMarkdownSuite {
           |error: cannot import something called MdocSession.md:3:9:
           |Reference to MdocSession is ambiguous.
           |It is both defined in package repl
-          |and imported by name subsequently by import util.{...}
+          |and imported by name subsequently by import scala.util.{...}
           |val x = MdocSession.nextInt(1)
           |        ^^^^^^^^^^^
         """.stripMargin