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.

Sign up for GitHub

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

Update scala-compiler, scala-library, ... to 2.13.6 #507

Merged
merged 2 commits into from
May 24, 2021
Merged

Update scala-compiler, scala-library, ... to 2.13.6 #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
906b9ab
Update scala-compiler, scala-library, ... to 2.13.6
scala-steward May 24, 2021
7a52d56
Change workflow to run on Scala 2.13.6
tgodzik May 24, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import scala.collection.mutable

def scala212 = "2.12.13"
def scala211 = "2.11.12"
def scala213 = "2.13.5"
def scala213 = "2.13.6"
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"

Expand Down
12 changes: 6 additions & 6 deletions tests/unit/src/test/scala/tests/imports/DependencySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5: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
Expand Down
11 changes: 4 additions & 7 deletions tests/unit/src/test/scala/tests/markdown/ErrorSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ErrorSuite extends BaseMarkdownSuite {
.mkString("\n")
}
)

private val tab = "\t"
checkError(
"crash",
"""
Expand All @@ -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)
}
)
)

Expand Down