chore: Add support for Scala 2.13.12

scalameta · Sep 7, 2023 · aee7d16 · aee7d16
1 parent 26a176c
commit aee7d16
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
       - uses: olafurpg/setup-scala@v13
         with:
           java-version: adopt@1.11
-      - run: sbt '++2.13.11 test'
+      - run: sbt '++2.13.12 test'
         shell: bash
   test:
     name: ${{ matrix.command }} ${{ matrix.java }}
@@ -48,7 +48,7 @@ jobs:
           # Test legacy Scala versions, where reporting API changed
           - "'++2.12.12! test'"
           - "'++2.12.18 test'"
-          - "'++2.13.11 test'"
+          - "'++2.13.12 test'"
           # Minimal supported version
           - "'++3.1.3 test'"
           - "scripted"

diff --git a/.mergify.yml b/.mergify.yml
@@ -7,17 +7,17 @@ pull_request_rules:
       - check-success=Windows
       - check-success="'++2.12.12! test' adopt@1.8"
       - check-success="'++2.12.18 test' adopt@1.8"
-      - check-success="'++2.13.11 test' adopt@1.8"
+      - check-success="'++2.13.12 test' adopt@1.8"
       - check-success="'++3.1.3 test' adopt@1.8"
       - check-success="scripted adopt@1.8"
       - check-success="'++2.12.12! test' adopt@1.11"
       - check-success="'++2.12.18 test' adopt@1.11"
-      - check-success="'++2.13.11 test' adopt@1.11"
+      - check-success="'++2.13.12 test' adopt@1.11"
       - check-success="'++3.1.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.11 test' 17"
+      - check-success="'++2.13.12 test' 17"
       - check-success="'++3.1.3 test' 17"
       - check-success=scripted 17
     actions:

diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,7 @@
 import scala.collection.mutable
 
 def scala212 = "2.12.18"
-def scala213 = "2.13.11"
+def scala213 = "2.13.12"
 /* This should be kept at 3.1.3 until there is a
  * need for change and in that case we should bump to LTS*/
 def scala3 = "3.1.3"

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.11", "3.1.3", "3.3.0")
+ThisBuild / crossScalaVersions := List("2.12.18", "2.13.12", "3.1.3", "3.3.0")
 
 enablePlugins(MdocPlugin)
 mdocJS := Some(jsapp)

diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test
@@ -1,6 +1,6 @@
 > ++2.12.18 mdoc
 > check
-> ++2.13.11 mdoc
+> ++2.13.12 mdoc
 > check
 > ++3.1.3 mdoc
 > check

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.11"
+ThisBuild / scalaVersion := "2.13.12"
 
 enablePlugins(MdocPlugin)
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.11", "3.0.1")
+ThisBuild / crossScalaVersions := List("2.12.18", "2.13.12", "3.0.1")
 
 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
@@ -1,6 +1,6 @@
 > ++2.12.18 mdoc
 > check
-> ++2.13.11 mdoc
+> ++2.13.12 mdoc
 > check
 > ++3.1.3 mdoc
 > check

diff --git a/tests/unit/src/test/scala/tests/imports/DependencySuite.scala b/tests/unit/src/test/scala/tests/imports/DependencySuite.scala
@@ -87,16 +87,16 @@ class DependencySuite extends BaseMarkdownSuite {
         |  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`
-        |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
         |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: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
   )
 

diff --git a/tests/unit/src/test/scala/tests/markdown/NestSuite.scala b/tests/unit/src/test/scala/tests/markdown/NestSuite.scala
@@ -383,6 +383,11 @@ class NestSuite extends BaseMarkdownSuite {
            |Value classes may not be a local class
            |class Foo(val x: Int) extends AnyVal
            |      ^
+           |""".stripMargin,
+      Compat.Scala213 ->
+        """|error: anyval-nok.md:6:7: value class may not be a local class
+           |class Foo(val x: Int) extends AnyVal
+           |      ^^^
            |""".stripMargin
     )
   )