Change workflow to run on Scala 2.13.6

scalameta · May 24, 2021 · 7a52d56 · 7a52d56
1 parent 906b9ab
commit 7a52d56
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
           # Test legacy Scala versions, where reporting API changed
           - "'++2.12.12 test'"
           - "'++2.12.13 test' scripted"
-          - "'++2.13.5 test'"
+          - "'++2.13.6 test'"
           - "'++3.0.0 test'"
     steps:
       - uses: actions/checkout@v2

diff --git a/build.sbt b/build.sbt
@@ -7,7 +7,7 @@ def scala3 = List("3.0.0", "3.0.0-RC3", "3.0.0-RC2", "3.0.0-RC1")
 def scala2Versions = List(scala212, scala211, scala213)
 def allScalaVersions = scala2Versions ::: scala3
 
-def scalajs = "1.5.0"
+def scalajs = "1.5.1"
 def scalajsBinaryVersion = "1"
 def scalajsDom = "1.1.0"
 

diff --git a/tests/unit/src/test/scala/tests/imports/DependencySuite.scala b/tests/unit/src/test/scala/tests/imports/DependencySuite.scala
@@ -80,16 +80,16 @@ class DependencySuite extends BaseMarkdownSuite {
       |println(42)
       |```
       | """.stripMargin,
-    """|error: dep-error.md:4:13: Error downloading org.scalameta:not-exists_2.13.6:2.3.4
-       |<redacted user.home>
-       |  not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_2.13.5/2.3.4/not-exists_2.13.5-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
+    """|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:4:13: Error downloading org.scalameta:not-exists_2.13.6:2.3.4
+       |<redacted user.home>
+       |  not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_2.13.6/2.3.4/not-exists_2.13.6-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

diff --git a/tests/unit/src/test/scala/tests/markdown/ErrorSuite.scala b/tests/unit/src/test/scala/tests/markdown/ErrorSuite.scala
@@ -13,7 +13,7 @@ class ErrorSuite extends BaseMarkdownSuite {
           .mkString("\n")
       }
     )
-
+  private val tab = "\t"
   checkError(
     "crash",
     """
@@ -40,19 +40,16 @@ class ErrorSuite extends BaseMarkdownSuite {
            |x + y + z
            |^^^^^^^^^
            |scala.NotImplementedError: an implementation is missing
-           |	at scala.Predef$.$qmark$qmark$qmark(Predef.scala:345)
-           |""".stripMargin,
-      Compat.Scala3 -> {
+           |<TAB>at scala.Predef$.$qmark$qmark$qmark(Predef.scala:344)
+           |""".stripMargin.replace("<TAB>", tab),
+      Compat.Scala3 ->
         // Anton: for some reason, the compiler(?) returns tab in this particular place
-        val tab = "\t"
-
         """|error: crash.md:10:1: an implementation is missing
            |x + y + z
            |^^^^^^^^^
            |scala.NotImplementedError: an implementation is missing
            |<TAB>at scala.Predef$.$qmark$qmark$qmark(Predef.scala:345)
            """.stripMargin.replace("<TAB>", tab)
-      }
     )
   )