Skip to content

Commit beb329d

Browse files
authored
Bump Scala 2.13 to 2.13.17 (#3895)
1 parent ecaaa8d commit beb329d

File tree

3 files changed

+29
-4
lines changed

3 files changed

+29
-4
lines changed

modules/integration/src/test/scala/scala/cli/integration/RunScriptTestDefinitions.scala

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,9 @@ trait RunScriptTestDefinitions { _: RunTestDefinitions =>
390390
|${tab}at throws$$.something(throws.sc:2)
391391
|${tab}at throws$$.delayedEndpoint$$throws$$1(throws.sc:3)
392392
|$tab... 10 more""".stripMargin.linesIterator.toVector
393-
else if (actualScalaVersion.coursierVersion >= ("2.13.13".coursierVersion))
393+
else if (
394+
actualScalaVersion.coursierVersion >= "2.13.13".coursierVersion && actualScalaVersion.coursierVersion < "2.13.17".coursierVersion
395+
)
394396
s"""Exception in thread "main" java.lang.Exception: Caught exception during processing
395397
|${tab}at throws$$.delayedEndpoint$$throws$$1(throws.sc:6)
396398
|${tab}at throws$$delayedInit$$body.apply(throws.sc:65534)
@@ -412,6 +414,28 @@ trait RunScriptTestDefinitions { _: RunTestDefinitions =>
412414
|${tab}at throws$$.delayedEndpoint$$throws$$1(throws.sc:3)
413415
|$tab... 13 more
414416
|""".stripMargin.linesIterator.toVector
417+
else if (actualScalaVersion.coursierVersion >= "2.13.17".coursierVersion)
418+
s"""Exception in thread "main" java.lang.Exception: Caught exception during processing
419+
|${tab}at throws$$.delayedEndpoint$$throws$$1(throws.sc:6)
420+
|${tab}at throws$$delayedInit$$body.apply(throws.sc:65534)
421+
|${tab}at scala.Function0.apply$$mcV$$sp(Function0.scala:42)
422+
|${tab}at scala.Function0.apply$$mcV$$sp$$(Function0.scala:42)
423+
|${tab}at scala.runtime.AbstractFunction0.apply$$mcV$$sp(AbstractFunction0.scala:17)
424+
|${tab}at scala.App.$$anonfun$$main$$1(App.scala:98)
425+
|${tab}at scala.App.$$anonfun$$main$$1$$adapted(App.scala:98)
426+
|${tab}at scala.collection.IterableOnceOps.foreach(IterableOnce.scala:630)
427+
|${tab}at scala.collection.IterableOnceOps.foreach$$(IterableOnce.scala:628)
428+
|${tab}at scala.collection.AbstractIterable.foreach(Iterable.scala:936)
429+
|${tab}at scala.App.main(App.scala:98)
430+
|${tab}at scala.App.main$$(App.scala:96)
431+
|${tab}at throws$$.main(throws.sc:65534)
432+
|${tab}at throws.main(throws.sc)
433+
|Caused by: java.lang.RuntimeException: nope
434+
|${tab}at scala.sys.package$$.error(package.scala:27)
435+
|${tab}at throws$$.something(throws.sc:2)
436+
|${tab}at throws$$.delayedEndpoint$$throws$$1(throws.sc:3)
437+
|$tab... 13 more
438+
|""".stripMargin.linesIterator.toVector
415439
else
416440
s"""Exception in thread "main" java.lang.Exception: Caught exception during processing
417441
|${tab}at throws$$.delayedEndpoint$$throws$$1(throws.sc:6)

project/deps/package.mill.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object Cli {
88

99
object Scala {
1010
def scala212 = "2.12.20"
11-
def scala213 = "2.13.16"
11+
def scala213 = "2.13.17"
1212
def scala3LtsPrefix = "3.3" // used for the LTS version tags
1313
def scala3Lts = s"$scala3LtsPrefix.6" // the LTS version currently used in the build
1414
def runnerScala3 = scala3Lts
@@ -72,7 +72,7 @@ object Scala {
7272
.filter(minorVer(_) < minorVer(scala3Lts))
7373

7474
def maxAmmoniteScala212Version = scala212
75-
def maxAmmoniteScala213Version = scala213
75+
def maxAmmoniteScala213Version = "2.13.16"
7676
def maxAmmoniteScala3Version = "3.6.3"
7777
def maxAmmoniteScala3LtsVersion = "3.3.5"
7878
lazy val listMaxAmmoniteScalaVersion: Seq[String] =

website/docs/reference/scala-versions.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@ it is recommended to update scala-cli.
3333
| 1.8.0 | 3.7.0 | 2.13.16 | 2.12.20 |
3434
| 1.8.1 - 1.8.4 | 3.7.1 | 2.13.16 | 2.12.20 |
3535
| 1.8.5 - 1.9.0 | 3.7.2 | 2.13.16 | 2.12.20 |
36-
| 1.9.1 - current | 3.7.3 | 2.13.16 | 2.12.20 |
36+
| 1.9.1 | 3.7.3 | 2.13.16 | 2.12.20 |
37+
| 1.10.0 - current | 3.7.3 | 2.13.17 | 2.12.20 |
3738

0 commit comments

Comments
 (0)