Skip to content

Commit 181e48a

Browse files
kitbellewkitbellew
committed
scala: upgrade 2.13 to .17
1 parent ad4d022 commit 181e48a

File tree

8 files changed

+71
-49
lines changed

8 files changed

+71
-49
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
distribution: temurin
8484
cache: sbt
8585
- uses: sbt/setup-sbt@v1
86-
- run: sbt '++2.13.16 test'
86+
- run: sbt '++2.13.17 test'
8787
shell: bash
8888
test:
8989
name: ${{ matrix.command }} ${{ matrix.java }}
@@ -96,7 +96,7 @@ jobs:
9696
# Test legacy Scala versions, where reporting API changed
9797
- "'++2.12.12! testAllNonNative'" # compiler version too old for Scala Native
9898
- "'++2.12.19 test'"
99-
- "'++2.13.16 test'"
99+
- "'++2.13.17 test'"
100100
# Minimal supported version
101101
- "'++3.3.6 test'"
102102
- "'++3.7.3 plugin/test'"

‎.mergify.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ pull_request_rules:
77
- check-success=Windows
88
- check-success="'++2.12.12! testAllNonNative' 11"
99
- check-success="'++2.12.19 test' 11"
10-
- check-success="'++2.13.16 test' 11"
10+
- check-success="'++2.13.17 test' 11"
1111
- check-success="'++3.3.6 test' 11"
1212
- check-success="scripted 11"
1313
- check-success="'++2.12.12! testAllNonNative' 17"
1414
- check-success="'++2.12.19 test' 17"
15-
- check-success="'++2.13.16 test' 17"
15+
- check-success="'++2.13.17 test' 17"
1616
- check-success="'++3.3.6 test' 17"
1717
- check-success="scripted 17"
1818
actions:

‎build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ addCommandAlias(
88
)
99

1010
def scala212 = "2.12.20"
11-
def scala213 = "2.13.16"
11+
def scala213 = "2.13.17"
1212
def scala3 = "3.3.6"
1313
def scala3ForSbt = "3.7.3"
1414
def scala2Versions = List(scala212, scala213)

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
ThisBuild / scalaVersion := "2.12.20"
2-
ThisBuild / crossScalaVersions := List("2.12.20", "2.13.16", "3.3.6")
2+
ThisBuild / crossScalaVersions := List(
3+
"2.12.20",
4+
"2.13.17",
5+
"3.3.6"
6+
)
37

48
enablePlugins(MdocPlugin)
59
mdocJS := Some(jsapp)

‎mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
ThisBuild / scalaVersion := "2.13.16"
1+
ThisBuild / scalaVersion := "2.13.17"
22

33
enablePlugins(MdocPlugin)

‎tests/unit/src/main/scala/tests/markdown/BaseMarkdownSuite.scala‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ abstract class BaseMarkdownSuite extends tests.BaseSuite {
6161
original: String,
6262
expected: String,
6363
settings: Settings = baseSettings(),
64-
compat: Map[Compat.ScalaVersion, String] = Map.empty
64+
compat: Map[Compat.ScalaVersion, String] = Map.empty,
65+
expectedContains: Seq[String] = Seq.empty
6566
)(implicit loc: munit.Location): Unit = {
6667
test(name) {
6768
val reporter = newReporter()
@@ -75,10 +76,22 @@ abstract class BaseMarkdownSuite extends tests.BaseSuite {
7576
postProcessObtained
7677
)
7778

78-
assertNoDiff(
79-
Compat(obtainedErrors, Map.empty, postProcessObtained),
80-
Compat(expected, compat, postProcessExpected)
81-
)
79+
val obtained = Compat(obtainedErrors, Map.empty, postProcessObtained)
80+
if (expected.nonEmpty || expectedContains.isEmpty)
81+
assertNoDiff(
82+
obtained,
83+
Compat(expected, compat, postProcessExpected)
84+
)
85+
expectedContains.foreach { x =>
86+
val exp = Compat(x, Map.empty, postProcessExpected)
87+
assert(
88+
obtained.contains(exp),
89+
s"""|>>>>>>>> Expected:
90+
|$obtained
91+
|<<<<<<<< to contain:
92+
|$exp""".stripMargin
93+
)
94+
}
8295
}
8396
}
8497

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

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -142,22 +142,24 @@ class DependencySuite extends BaseMarkdownSuite {
142142
|println(42)
143143
|```
144144
| """.stripMargin,
145-
s"""|error: dep-error.md:4:13: Error downloading org.scalameta:not-exists_${BuildInfo.scalaVersion}:2.3.4
146-
|<redacted user.home>
147-
| not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_${BuildInfo.scalaVersion}/2.3.4/not-exists_${BuildInfo.scalaVersion}-2.3.4.pom
148-
|import $$dep.`org.scalameta:::not-exists:2.3.4`
149-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
150-
|error: dep-error.md:3:49: Error downloading org.scalameta:foobar:1.2.1
151-
|<redacted user.home>
152-
| not found: https://repo1.maven.org/maven2/org/scalameta/foobar/1.2.1/foobar-1.2.1.pom
153-
|import $$dep.`org.scalameta::mmunit:2.3.4`, $$dep.`org.scalameta:foobar:1.2.1`
154-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
155-
|error: dep-error.md:3:13: Error downloading org.scalameta:mmunit_2.13:2.3.4
156-
|<redacted user.home>
157-
| not found: https://repo1.maven.org/maven2/org/scalameta/mmunit_2.13/2.3.4/mmunit_2.13-2.3.4.pom
158-
|import $$dep.`org.scalameta::mmunit:2.3.4`, $$dep.`org.scalameta:foobar:1.2.1`
159-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
160-
|""".stripMargin
145+
"",
146+
expectedContains = Seq(
147+
s"""|error: dep-error.md:4:13: Error downloading org.scalameta:not-exists_${BuildInfo.scalaVersion}:2.3.4
148+
|<redacted user.home>
149+
| not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_${BuildInfo.scalaVersion}/2.3.4/not-exists_${BuildInfo.scalaVersion}-2.3.4.pom
150+
|import $$dep.`org.scalameta:::not-exists:2.3.4`
151+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^""".stripMargin,
152+
s"""|error: dep-error.md:3:49: Error downloading org.scalameta:foobar:1.2.1
153+
|<redacted user.home>
154+
| not found: https://repo1.maven.org/maven2/org/scalameta/foobar/1.2.1/foobar-1.2.1.pom
155+
|import $$dep.`org.scalameta::mmunit:2.3.4`, $$dep.`org.scalameta:foobar:1.2.1`
156+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^""".stripMargin,
157+
s"""|error: dep-error.md:3:13: Error downloading org.scalameta:mmunit_${BuildInfo.scalaBinaryVersion}:2.3.4
158+
|<redacted user.home>
159+
| not found: https://repo1.maven.org/maven2/org/scalameta/mmunit_${BuildInfo.scalaBinaryVersion}/2.3.4/mmunit_${BuildInfo.scalaBinaryVersion}-2.3.4.pom
160+
|import $$dep.`org.scalameta::mmunit:2.3.4`, $$dep.`org.scalameta:foobar:1.2.1`
161+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^""".stripMargin
162+
)
161163
)
162164

163165
checkError(
@@ -170,22 +172,24 @@ class DependencySuite extends BaseMarkdownSuite {
170172
|println(42)
171173
|```
172174
| """.stripMargin,
173-
s"""|error: dep-error-using.md:4:11: Error downloading org.scalameta:not-exists_2.13.16:2.3.4
174-
|<redacted user.home>
175-
| not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_2.13.16/2.3.4/not-exists_2.13.16-2.3.4.pom
176-
|//> using dep org.scalameta:::not-exists:2.3.4
177-
| ^
178-
|error: dep-error-using.md:3:11: Error downloading org.scalameta:foobar:1.2.1
179-
|<redacted user.home>
180-
| not found: https://repo1.maven.org/maven2/org/scalameta/foobar/1.2.1/foobar-1.2.1.pom
181-
|//> using dep org.scalameta::mmunit:2.3.4 org.scalameta:foobar:1.2.1
182-
| ^
183-
|error: dep-error-using.md:3:11: Error downloading org.scalameta:mmunit_2.13:2.3.4
184-
|<redacted user.home>
185-
| not found: https://repo1.maven.org/maven2/org/scalameta/mmunit_2.13/2.3.4/mmunit_2.13-2.3.4.pom
186-
|//> using dep org.scalameta::mmunit:2.3.4 org.scalameta:foobar:1.2.1
187-
| ^
188-
|""".stripMargin
175+
"",
176+
expectedContains = Seq(
177+
s"""|error: dep-error-using.md:4:11: Error downloading org.scalameta:not-exists_${BuildInfo.scalaVersion}:2.3.4
178+
|<redacted user.home>
179+
| not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_${BuildInfo.scalaVersion}/2.3.4/not-exists_${BuildInfo.scalaVersion}-2.3.4.pom
180+
|//> using dep org.scalameta:::not-exists:2.3.4
181+
| ^""".stripMargin,
182+
s"""|error: dep-error-using.md:3:11: Error downloading org.scalameta:foobar:1.2.1
183+
|<redacted user.home>
184+
| not found: https://repo1.maven.org/maven2/org/scalameta/foobar/1.2.1/foobar-1.2.1.pom
185+
|//> using dep org.scalameta::mmunit:2.3.4 org.scalameta:foobar:1.2.1
186+
| ^""".stripMargin,
187+
s"""|error: dep-error-using.md:3:11: Error downloading org.scalameta:mmunit_${BuildInfo.scalaBinaryVersion}:2.3.4
188+
|<redacted user.home>
189+
| not found: https://repo1.maven.org/maven2/org/scalameta/mmunit_${BuildInfo.scalaBinaryVersion}/2.3.4/mmunit_${BuildInfo.scalaBinaryVersion}-2.3.4.pom
190+
|//> using dep org.scalameta::mmunit:2.3.4 org.scalameta:foobar:1.2.1
191+
| ^""".stripMargin
192+
)
189193
)
190194

191195
checkError(

‎tests/unit/src/test/scala/tests/markdown/AsyncSuite.scala‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,13 @@ class AsyncSuite extends BaseMarkdownSuite {
6969
|Await.result(Future(Thread.sleep(1000)), Duration("10ms"))
7070
|^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7171
|java.util.concurrent.TimeoutException: Future timed out after [10 milliseconds]
72-
| at scala.concurrent.impl.Promise$DefaultPromise.tryAwait0(Promise.scala:248)
73-
| at scala.concurrent.impl.Promise$DefaultPromise.result(Promise.scala:261)
74-
| at scala.concurrent.Await$.$anonfun$result$1(package.scala:201)
72+
| at scala.concurrent.Future$.timeoutError(Future.scala:581)
73+
| at scala.concurrent.impl.Promise$DefaultPromise.tryAwait0(Promise.scala:258)
74+
| at scala.concurrent.impl.Promise$DefaultPromise.result(Promise.scala:271)
75+
| at scala.concurrent.Await$.$anonfun$result$1(package.scala:208)
7576
| at scala.concurrent.BlockContext$DefaultBlockContext$.blockOn(BlockContext.scala:62)
76-
| at scala.concurrent.Await$.result(package.scala:124)
77-
| at repl.MdocSession$MdocApp.<init>(timeout.md:11)
77+
| at scala.concurrent.Await$.result(package.scala:125)
78+
| at repl.MdocSession$MdocApp.<clinit>(timeout.md:11)
7879
| at repl.MdocSession$.app(timeout.md:3)
7980
|""".stripMargin,
8081
Compat.Scala3 ->

0 commit comments

Comments
 (0)