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.7 #585

Merged
merged 2 commits into from
Nov 22, 2021
Merged

Update scala-compiler, scala-library, ... to 2.13.7 #585

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
86bb677
Update scala-compiler, scala-library, ... to 2.13.7
scala-steward Nov 20, 2021
7ebc7ba
Change all Scala 2.13 references to 2.13.7
tgodzik Nov 22, 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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: olafurpg/setup-scala@v13
with:
java-version: adopt@1.11
- run: sbt '++2.13.6 test'
- run: sbt '++2.13.7 test'
shell: bash
test:
name: ${{ matrix.command }} ${{ matrix.java }}
Expand All @@ -43,7 +43,7 @@ jobs:
# Test legacy Scala versions, where reporting API changed
- "'++2.12.12 test'"
- "'++2.12.14 test'"
- "'++2.13.6 test'"
- "'++2.13.7 test'"
- "'++3.1.0 test'"
- "scripted"
steps:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import scala.collection.mutable

def scala212 = "2.12.15"
def scala211 = "2.11.12"
def scala213 = "2.13.6"
def scala213 = "2.13.7"
def scala3 = "3.1.0"
def scala2Versions = List(scala212, scala211, scala213)
def allScalaVersions = scala2Versions :+ scala3
Expand Down
2 changes: 1 addition & 1 deletion mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ThisBuild / scalaVersion := "2.12.15"
ThisBuild / crossScalaVersions := List("2.12.15", "2.13.6", "3.0.1")
ThisBuild / crossScalaVersions := List("2.12.15", "2.13.7", "3.0.1")

enablePlugins(MdocPlugin)
mdocJS := Some(jsapp)
Expand Down
2 changes: 1 addition & 1 deletion mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
> ++2.12.15 mdoc
> check
> ++2.13.6 mdoc
> ++2.13.7 mdoc
> check
> ++3.1.0 mdoc
> check
Expand Down
53 changes: 17 additions & 36 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 @@ -81,42 +81,23 @@ class DependencySuite extends BaseMarkdownSuite {
|import $dep.`org.scalameta::munit:0.7.5` // resolves OK
|println(42)
|```
| """.stripMargin, {
if (Properties.isWin)
s"""|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_${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
else
s"""|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_${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
}
| """.stripMargin,
s"""|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: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`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|""".stripMargin
)

checkError(
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/src/test/scala/tests/markdown/AsyncSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ class AsyncSuite extends BaseMarkdownSuite {
|Await.result(Future(Thread.sleep(1000)), Duration("10ms"))
|^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|java.util.concurrent.TimeoutException: Future timed out after [10 milliseconds]
| at scala.concurrent.impl.Promise$DefaultPromise.tryAwait0(Promise.scala:212)
| at scala.concurrent.impl.Promise$DefaultPromise.result(Promise.scala:225)
| at scala.concurrent.impl.Promise$DefaultPromise.tryAwait0(Promise.scala:248)
| at scala.concurrent.impl.Promise$DefaultPromise.result(Promise.scala:261)
| at scala.concurrent.Await$.$anonfun$result$1(package.scala:201)
| at scala.concurrent.BlockContext$DefaultBlockContext$.blockOn(BlockContext.scala:62)
| at scala.concurrent.Await$.result(package.scala:124)
Expand Down