Skip to content

Commit

Permalink
chore: Update everything to 2.13.16
Browse files Browse the repository at this point in the history
  • Loading branch information
tgodzik committed Jan 28, 2025
1 parent 0620cd4 commit 3c56521
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
distribution: temurin
cache: sbt
- uses: sbt/setup-sbt@v1
- run: sbt '++2.13.15 test'
- run: sbt '++2.13.16 test'
shell: bash
test:
name: ${{ matrix.command }} ${{ matrix.java }}
Expand All @@ -59,7 +59,7 @@ jobs:
# Test legacy Scala versions, where reporting API changed
- "'++2.12.12! testAllNonNative'" # compiler version too old for Scala Native
- "'++2.12.19 test'"
- "'++2.13.15 test'"
- "'++2.13.16 test'"
# Minimal supported version
- "'++3.3.4 test'"
- "scripted"
Expand Down
4 changes: 2 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ pull_request_rules:
- check-success=Windows
- check-success="'++2.12.12! test' adopt@1.11"
- check-success="'++2.12.19 test' adopt@1.11"
- check-success="'++2.13.15 test' adopt@1.11"
- check-success="'++2.13.16 test' adopt@1.11"
- check-success="'++3.3.4 test' adopt@1.11"
- check-success="scripted adopt@1.11"
- check-success="'++2.12.12! test' 17"
- check-success="'++2.12.19 test' 17"
- check-success="'++2.13.15 test' 17"
- check-success="'++2.13.16 test' 17"
- check-success="'++3.3.4 test' 17"
- check-success=scripted 17
actions:
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.19 mdoc
> check
> ++2.13.15 mdoc
> ++2.13.16 mdoc
> check
> ++3.3.4 mdoc
> check
Expand Down
12 changes: 6 additions & 6 deletions tests/unit/src/test/scala/tests/imports/DependencySuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,12 @@ class DependencySuite extends BaseMarkdownSuite {
|println(42)
|```
| """.stripMargin,
s"""|error: dep-error.md:3:49: Error downloading org.scalameta:foobar:1.2.1
s"""|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: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`
Expand All @@ -92,11 +97,6 @@ class DependencySuite extends BaseMarkdownSuite {
| 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`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|""".stripMargin
)

Expand Down
11 changes: 10 additions & 1 deletion tests/unit/src/test/scala/tests/imports/ScalacSuite.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package tests.imports

import tests.markdown.BaseMarkdownSuite
import tests.markdown.Compat

class ScalacSuite extends BaseMarkdownSuite {

Expand All @@ -17,7 +18,15 @@ class ScalacSuite extends BaseMarkdownSuite {
|warning: import.md:4:1: Unused import
|import scala.util.Try
|^^^^^^^^^^^^^^^^^^^^^
|""".stripMargin
|""".stripMargin,
compat = Map(
Compat.Scala213 ->
"""|error: No warnings can be incurred under -Werror.
|warning: import.md:4:19: Unused import
|import scala.util.Try
| ^^^
|""".stripMargin
)
)

check(
Expand Down

0 comments on commit 3c56521

Please sign in to comment.