Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Add support for Scala 2.13.12 #793

Merged
merged 1 commit into from
Sep 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
> ++2.12.18 mdoc
> check
> ++2.13.11 mdoc
> ++2.13.12 mdoc
> check
> ++3.1.3 mdoc
> check
Expand Down
2 changes: 1 addition & 1 deletion mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ThisBuild / scalaVersion := "2.13.11"
ThisBuild / scalaVersion := "2.13.12"

enablePlugins(MdocPlugin)
2 changes: 1 addition & 1 deletion mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/build.sbt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/test
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
> ++2.12.18 mdoc
> check
> ++2.13.11 mdoc
> ++2.13.12 mdoc
> check
> ++3.1.3 mdoc
> check
Expand Down
10 changes: 5 additions & 5 deletions tests/unit/src/test/scala/tests/imports/DependencySuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
5 changes: 5 additions & 0 deletions tests/unit/src/test/scala/tests/markdown/NestSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
)
Expand Down
Loading