Merge pull request #2755 from Gedochao/maintenance/bump-scala-2.13.13

Bump Scala 2.13 to 2.13.13
VirtusLab · Feb 27, 2024 · 8e6a14e · 8e6a14e
2 parents ac4a7b4 + c777e3e
commit 8e6a14e
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 5 deletions.
diff --git 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)

diff --git 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/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
 
 <ChainedSnippets>
 
-```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
@@ -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
 ```
 

diff --git 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 |
-Original file line number
+Diff line change
@@ Expand Up @@
     <ChainedSnippets>
-    ```bash
+    ```bash ignore
     scala-cli --cli-version nightly version
     ```
@@ Expand Down @@