Skip to content

Commit 81e5c1e

Browse files
committed
chore: Add support for Scala 2.13.12
1 parent 26a176c commit 81e5c1e

File tree

10 files changed

+21
-16
lines changed

10 files changed

+21
-16
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- uses: olafurpg/setup-scala@v13
3636
with:
3737
java-version: adopt@1.11
38-
- run: sbt '++2.13.11 test'
38+
- run: sbt '++2.13.12 test'
3939
shell: bash
4040
test:
4141
name: ${{ matrix.command }} ${{ matrix.java }}
@@ -48,7 +48,7 @@ jobs:
4848
# Test legacy Scala versions, where reporting API changed
4949
- "'++2.12.12! test'"
5050
- "'++2.12.18 test'"
51-
- "'++2.13.11 test'"
51+
- "'++2.13.12 test'"
5252
# Minimal supported version
5353
- "'++3.1.3 test'"
5454
- "scripted"

.mergify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ pull_request_rules:
77
- check-success=Windows
88
- check-success="'++2.12.12! test' adopt@1.8"
99
- check-success="'++2.12.18 test' adopt@1.8"
10-
- check-success="'++2.13.11 test' adopt@1.8"
10+
- check-success="'++2.13.12 test' adopt@1.8"
1111
- check-success="'++3.1.3 test' adopt@1.8"
1212
- check-success="scripted adopt@1.8"
1313
- check-success="'++2.12.12! test' adopt@1.11"
1414
- check-success="'++2.12.18 test' adopt@1.11"
15-
- check-success="'++2.13.11 test' adopt@1.11"
15+
- check-success="'++2.13.12 test' adopt@1.11"
1616
- check-success="'++3.1.3 test' adopt@1.11"
1717
- check-success="scripted adopt@1.11"
1818
- check-success="'++2.12.12! test' 17"
1919
- check-success="'++2.12.18 test' 17"
20-
- check-success="'++2.13.11 test' 17"
20+
- check-success="'++2.13.12 test' 17"
2121
- check-success="'++3.1.3 test' 17"
2222
- check-success=scripted 17
2323
actions:

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import scala.collection.mutable
22

33
def scala212 = "2.12.18"
4-
def scala213 = "2.13.11"
4+
def scala213 = "2.13.12"
55
/* This should be kept at 3.1.3 until there is a
66
* need for change and in that case we should bump to LTS*/
77
def scala3 = "3.1.3"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ThisBuild / scalaVersion := "2.12.18"
2-
ThisBuild / crossScalaVersions := List("2.12.18", "2.13.11", "3.1.3", "3.3.0")
2+
ThisBuild / crossScalaVersions := List("2.12.18", "2.13.12", "3.1.3", "3.3.0")
33

44
enablePlugins(MdocPlugin)
55
mdocJS := Some(jsapp)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
> ++2.12.18 mdoc
22
> check
3-
> ++2.13.11 mdoc
3+
> ++2.13.12 mdoc
44
> check
55
> ++3.1.3 mdoc
66
> check
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
ThisBuild / scalaVersion := "2.13.11"
1+
ThisBuild / scalaVersion := "2.13.12"
22

33
enablePlugins(MdocPlugin)

mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ThisBuild / scalaVersion := "2.12.18"
2-
ThisBuild / crossScalaVersions := List("2.12.18", "2.13.11", "3.0.1")
2+
ThisBuild / crossScalaVersions := List("2.12.18", "2.13.12", "3.0.1")
33

44
enablePlugins(MdocPlugin)
55
mdocJS := Some(jsapp)

mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
> ++2.12.18 mdoc
22
> check
3-
> ++2.13.11 mdoc
3+
> ++2.13.12 mdoc
44
> check
55
> ++3.1.3 mdoc
66
> check

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,16 @@ class DependencySuite extends BaseMarkdownSuite {
8787
| not found: https://repo1.maven.org/maven2/org/scalameta/foobar/1.2.1/foobar-1.2.1.pom
8888
|import $$dep.`org.scalameta::mmunit:2.3.4`, $$dep.`org.scalameta:foobar:1.2.1`
8989
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
90-
|error: dep-error.md:3:13: Error downloading org.scalameta:mmunit_2.13:2.3.4
91-
|<redacted user.home>
92-
| not found: https://repo1.maven.org/maven2/org/scalameta/mmunit_2.13/2.3.4/mmunit_2.13-2.3.4.pom
93-
|import $$dep.`org.scalameta::mmunit:2.3.4`, $$dep.`org.scalameta:foobar:1.2.1`
94-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9590
|error: dep-error.md:4:13: Error downloading org.scalameta:not-exists_${BuildInfo.scalaVersion}:2.3.4
9691
|<redacted user.home>
9792
| not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_${BuildInfo.scalaVersion}/2.3.4/not-exists_${BuildInfo.scalaVersion}-2.3.4.pom
9893
|import $$dep.`org.scalameta:::not-exists:2.3.4`
9994
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
95+
|error: dep-error.md:3:13: Error downloading org.scalameta:mmunit_2.13:2.3.4
96+
|<redacted user.home>
97+
| not found: https://repo1.maven.org/maven2/org/scalameta/mmunit_2.13/2.3.4/mmunit_2.13-2.3.4.pom
98+
|import $$dep.`org.scalameta::mmunit:2.3.4`, $$dep.`org.scalameta:foobar:1.2.1`
99+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
100100
|""".stripMargin
101101
)
102102

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,11 @@ class NestSuite extends BaseMarkdownSuite {
383383
|Value classes may not be a local class
384384
|class Foo(val x: Int) extends AnyVal
385385
| ^
386+
|""".stripMargin,
387+
Compat.Scala213 ->
388+
"""|error: anyval-nok.md:6:7: value class may not be a local class
389+
|class Foo(val x: Int) extends AnyVal
390+
| ^^^
386391
|""".stripMargin
387392
)
388393
)

0 commit comments

Comments
 (0)