From 5fb5ab4bd08af0f42575a8623d2ad09fc04de5c5 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Fri, 23 Feb 2024 11:48:35 +0100 Subject: [PATCH 1/3] Bump Scala 2.13 to 2.13.13 --- project/deps.sc | 4 ++-- website/docs/reference/scala-versions.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/deps.sc b/project/deps.sc index 14686e75e7..be1918fb2e 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ object Scala { def scala212 = "2.12.19" - def scala213 = "2.13.12" + def scala213 = "2.13.13" def runnerScala3 = "3.0.2" // the newest version that is compatible with all Scala 3.x versions def scala3LtsPrefix = "3.3" // used for the LTS version tags def scala3Lts = s"$scala3LtsPrefix.2" // the LTS version currently used in the build @@ -46,7 +46,7 @@ object Scala { } def maxAmmoniteScala212Version = "2.12.18" - def maxAmmoniteScala213Version = scala213 + def maxAmmoniteScala213Version = "2.13.12" def maxAmmoniteScala3Version = "3.3.1" lazy val listMaxAmmoniteScalaVersion = Seq(maxAmmoniteScala212Version, maxAmmoniteScala213Version, maxAmmoniteScala3Version) diff --git a/website/docs/reference/scala-versions.md b/website/docs/reference/scala-versions.md index 8c03d65e7b..449a773020 100644 --- a/website/docs/reference/scala-versions.md +++ b/website/docs/reference/scala-versions.md @@ -21,5 +21,5 @@ it is recommended to update scala-cli. | 1.0.0 - 1.0.1 | 3.3.0 | 2.13.10 | 2.12.17 | | 1.0.1 - 1.0.4 | 3.3.0 | 2.13.11 | 2.12.18 | | 1.0.5 - 1.1.3 | 3.3.1 | 2.13.12 | 2.12.18 | -| 1.2.0 - current | 3.4.0 | 2.13.12 | 2.12.19 | +| 1.2.0 - current | 3.4.0 | 2.13.13 | 2.12.19 | From b58c17da39dd5b76f07aca67937991db92cff848 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Mon, 26 Feb 2024 15:54:48 +0100 Subject: [PATCH 2/3] Adjust stack trace tests for 2.13.13 --- .../RunScriptTestDefinitions.scala | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/integration/src/test/scala/scala/cli/integration/RunScriptTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/RunScriptTestDefinitions.scala index 1437385a83..682ee64d77 100644 --- a/modules/integration/src/test/scala/scala/cli/integration/RunScriptTestDefinitions.scala +++ b/modules/integration/src/test/scala/scala/cli/integration/RunScriptTestDefinitions.scala @@ -231,6 +231,28 @@ trait RunScriptTestDefinitions { _: RunTestDefinitions => |${tab}at throws$$.something(throws.sc:2) |${tab}at throws$$.delayedEndpoint$$throws$$1(throws.sc:3) |$tab... 10 more""".stripMargin.linesIterator.toVector + else if (actualScalaVersion.coursierVersion >= ("2.13.13".coursierVersion)) + s"""Exception in thread "main" java.lang.Exception: Caught exception during processing + |${tab}at throws$$.delayedEndpoint$$throws$$1(throws.sc:6) + |${tab}at throws$$delayedInit$$body.apply(throws.sc:65534) + |${tab}at scala.Function0.apply$$mcV$$sp(Function0.scala:42) + |${tab}at scala.Function0.apply$$mcV$$sp$$(Function0.scala:42) + |${tab}at scala.runtime.AbstractFunction0.apply$$mcV$$sp(AbstractFunction0.scala:17) + |${tab}at scala.App.$$anonfun$$main$$1(App.scala:98) + |${tab}at scala.App.$$anonfun$$main$$1$$adapted(App.scala:98) + |${tab}at scala.collection.IterableOnceOps.foreach(IterableOnce.scala:619) + |${tab}at scala.collection.IterableOnceOps.foreach$$(IterableOnce.scala:617) + |${tab}at scala.collection.AbstractIterable.foreach(Iterable.scala:935) + |${tab}at scala.App.main(App.scala:98) + |${tab}at scala.App.main$$(App.scala:96) + |${tab}at throws$$.main(throws.sc:65534) + |${tab}at throws.main(throws.sc) + |Caused by: java.lang.RuntimeException: nope + |${tab}at scala.sys.package$$.error(package.scala:27) + |${tab}at throws$$.something(throws.sc:2) + |${tab}at throws$$.delayedEndpoint$$throws$$1(throws.sc:3) + |$tab... 13 more + |""".stripMargin.linesIterator.toVector else s"""Exception in thread "main" java.lang.Exception: Caught exception during processing |${tab}at throws$$.delayedEndpoint$$throws$$1(throws.sc:6) From c777e3e12766859977dd5b84ea68ae88eae808d6 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Tue, 27 Feb 2024 08:52:22 +0100 Subject: [PATCH 3/3] Don't test nightly Scala CLI versions in docs' tests --- website/docs/commands/basics.md | 2 +- website/docs/guides/introduction/old-runner-migration.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/commands/basics.md b/website/docs/commands/basics.md index ff3210818d..66d7de6eac 100644 --- a/website/docs/commands/basics.md +++ b/website/docs/commands/basics.md @@ -337,7 +337,7 @@ To use the latest Scala CLI nightly build, pass `nightly` to `--cli-version` par -```bash +```bash ignore scala-cli --cli-version nightly version ``` diff --git a/website/docs/guides/introduction/old-runner-migration.md b/website/docs/guides/introduction/old-runner-migration.md index f01eef3253..bd84ccc722 100644 --- a/website/docs/guides/introduction/old-runner-migration.md +++ b/website/docs/guides/introduction/old-runner-migration.md @@ -86,7 +86,7 @@ sub-command. For example, to call [the `package` sub-command](../../commands/package.md) using the nightly CLI version, do it like this: -```bash +```bash ignore scala-cli --cli-version nightly package --help ```