From 78c0053fbce420ca29f99cf931802c0492638c92 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Wed, 14 Aug 2024 13:45:50 +0200 Subject: [PATCH] Update Scala 3 Next to 3.5.0 --- project/deps.sc | 6 +++--- website/docs/reference/cli-options.md | 2 +- .../reference/scala-command/cli-options.md | 2 +- .../scala-command/runner-specification.md | 18 +++++++++--------- website/docs/reference/scala-versions.md | 3 ++- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/project/deps.sc b/project/deps.sc index 2c886939b7..233ac291f1 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -8,8 +8,8 @@ object Scala { 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.3" // the LTS version currently used in the build - def scala3Next = "3.4.2" // the newest/next version of Scala - def scala3NextAnnounced = scala3Next // the newest/next version of Scala that's been announced + def scala3Next = "3.5.0" // the newest/next version of Scala + def scala3NextAnnounced = "3.4.2" // the newest/next version of Scala that's been announced def scala3NextRc = "3.5.0-RC7" // the latest RC version of Scala Next // The Scala version used to build the CLI itself. @@ -51,7 +51,7 @@ object Scala { def maxAmmoniteScala212Version = scala212 def maxAmmoniteScala213Version = scala213 - def maxAmmoniteScala3Version = scala3Next + def maxAmmoniteScala3Version = scala3NextAnnounced lazy val listMaxAmmoniteScalaVersion = Seq(maxAmmoniteScala212Version, maxAmmoniteScala213Version, maxAmmoniteScala3Version) lazy val listAllAmmonite = { diff --git a/website/docs/reference/cli-options.md b/website/docs/reference/cli-options.md index 432ebe8919..0be8e0f766 100644 --- a/website/docs/reference/cli-options.md +++ b/website/docs/reference/cli-options.md @@ -1533,7 +1533,7 @@ Available in commands: Aliases: `-S`, `--scala` -Set the Scala version (3.4.2 by default) +Set the Scala version (3.5.0 by default) ### `--scala-binary-version` diff --git a/website/docs/reference/scala-command/cli-options.md b/website/docs/reference/scala-command/cli-options.md index 3233975c1c..922e736c09 100644 --- a/website/docs/reference/scala-command/cli-options.md +++ b/website/docs/reference/scala-command/cli-options.md @@ -996,7 +996,7 @@ Aliases: `-S`, `--scala` `MUST have` per Scala Runner specification -Set the Scala version (3.4.2 by default) +Set the Scala version (3.5.0 by default) ### `--scala-binary-version` diff --git a/website/docs/reference/scala-command/runner-specification.md b/website/docs/reference/scala-command/runner-specification.md index 50823ba575..2f231ad83c 100644 --- a/website/docs/reference/scala-command/runner-specification.md +++ b/website/docs/reference/scala-command/runner-specification.md @@ -92,7 +92,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.4.2 by default) +Set the Scala version (3.5.0 by default) Aliases: `-S` ,`--scala` @@ -861,7 +861,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.4.2 by default) +Set the Scala version (3.5.0 by default) Aliases: `-S` ,`--scala` @@ -1450,7 +1450,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.4.2 by default) +Set the Scala version (3.5.0 by default) Aliases: `-S` ,`--scala` @@ -2059,7 +2059,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.4.2 by default) +Set the Scala version (3.5.0 by default) Aliases: `-S` ,`--scala` @@ -2687,7 +2687,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.4.2 by default) +Set the Scala version (3.5.0 by default) Aliases: `-S` ,`--scala` @@ -3303,7 +3303,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.4.2 by default) +Set the Scala version (3.5.0 by default) Aliases: `-S` ,`--scala` @@ -3938,7 +3938,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.4.2 by default) +Set the Scala version (3.5.0 by default) Aliases: `-S` ,`--scala` @@ -4636,7 +4636,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.4.2 by default) +Set the Scala version (3.5.0 by default) Aliases: `-S` ,`--scala` @@ -5569,7 +5569,7 @@ Aliases: `-P` ,`--plugin` **--scala-version** -Set the Scala version (3.4.2 by default) +Set the Scala version (3.5.0 by default) Aliases: `-S` ,`--scala` diff --git a/website/docs/reference/scala-versions.md b/website/docs/reference/scala-versions.md index 1a8c6257ab..31d29fc099 100644 --- a/website/docs/reference/scala-versions.md +++ b/website/docs/reference/scala-versions.md @@ -24,5 +24,6 @@ it is recommended to update scala-cli. | 1.2.0 - 1.2.1 | 3.4.0 | 2.13.13 | 2.12.19 | | 1.2.1 - 1.3.0 | 3.4.1 | 2.13.13 | 2.12.19 | | 1.3.1 | 3.4.1 | 2.13.14 | 2.12.19 | -| 1.3.2 - current | 3.4.2 | 2.13.14 | 2.12.19 | +| 1.3.2 - 1.4.3 | 3.4.2 | 2.13.14 | 2.12.19 | +| 1.5.0 - current | 3.5.0 | 2.13.14 | 2.12.19 |