From 442facc74f45b3a682f81e16c9fa7f2d24d75990 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 30 Sep 2024 09:20:55 +0200 Subject: [PATCH] Update ammonite to 3.0.0-2-6342755f (#3214) * Update ammonite to 3.0.0-2-6342755f * Fix reference docs * Re-enable Ammonite tests for LTS --------- Co-authored-by: Piotr Chabelski --- .../src/test/scala/scala/cli/integration/ReplTests3Lts.scala | 2 ++ project/deps.sc | 4 ++-- website/docs/reference/cli-options.md | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/integration/src/test/scala/scala/cli/integration/ReplTests3Lts.scala b/modules/integration/src/test/scala/scala/cli/integration/ReplTests3Lts.scala index a962387ef2..6ca99ffc83 100644 --- a/modules/integration/src/test/scala/scala/cli/integration/ReplTests3Lts.scala +++ b/modules/integration/src/test/scala/scala/cli/integration/ReplTests3Lts.scala @@ -1,3 +1,5 @@ package scala.cli.integration class ReplTests3Lts extends ReplTestDefinitions with Test3Lts + with ReplAmmoniteTestDefinitions + with ReplAmmoniteTests3StableDefinitions diff --git a/project/deps.sc b/project/deps.sc index a4b0a3cdeb..ee451eedae 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -53,7 +53,7 @@ object Scala { def maxAmmoniteScala212Version = scala212 def maxAmmoniteScala213Version = "2.13.14" - def maxAmmoniteScala3Version = "3.5.0" + def maxAmmoniteScala3Version = "3.5.1" lazy val listMaxAmmoniteScalaVersion = Seq(maxAmmoniteScala212Version, maxAmmoniteScala213Version, maxAmmoniteScala3Version) lazy val listAllAmmonite = { @@ -99,7 +99,7 @@ object InternalDeps { object Deps { object Versions { - def ammonite = "3.0.0-M2-30-486378af" + def ammonite = "3.0.0-2-6342755f" def ammoniteForScala3Lts = ammonite // jni-utils version may need to be sync-ed when bumping the coursier version def coursierDefault = "2.1.13" diff --git a/website/docs/reference/cli-options.md b/website/docs/reference/cli-options.md index 1178bfe945..1292bdc188 100644 --- a/website/docs/reference/cli-options.md +++ b/website/docs/reference/cli-options.md @@ -1214,7 +1214,7 @@ Use Ammonite (instead of the default Scala REPL) Aliases: `--ammonite-ver` -Set the Ammonite version (3.0.0-M2-30-486378af by default) +Set the Ammonite version (3.0.0-2-6342755f by default) ### `--ammonite-arg`