From 0e4f7946097b83e8da9e664a2bd6d0223cc06bc8 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Fri, 27 Sep 2024 15:41:11 +0200 Subject: [PATCH] Set Scala 3.5.1 as the latest announced version (#3206) --- project/deps.sc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/project/deps.sc b/project/deps.sc index 09cb12d921..a4b0a3cdeb 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -9,7 +9,7 @@ object Scala { def scala3LtsPrefix = "3.3" // used for the LTS version tags def scala3Lts = s"$scala3LtsPrefix.4" // the LTS version currently used in the build def scala3Next = "3.5.1" // the newest/next version of Scala - def scala3NextAnnounced = "3.5.0" // the newest/next version of Scala that's been announced + def scala3NextAnnounced = scala3Next // the newest/next version of Scala that's been announced def scala3NextRc = "3.5.2-RC1" // the latest RC version of Scala Next // The Scala version used to build the CLI itself. @@ -18,13 +18,13 @@ object Scala { // The Scala version used by default to compile user input. def defaultUser = sys.props.get("scala.version.user").getOrElse(scala3Next) - val allScala2 = Seq(scala213, scala212) - val defaults = Seq(defaultInternal, defaultUser).distinct - val allScala3 = Seq(scala3Lts, scala3Next, scala3NextRc) - val all = (allScala2 ++ allScala3 ++ defaults).distinct - val scala3MainVersions = (defaults ++ allScala3).distinct - val mainVersions = (Seq(scala213) ++ scala3MainVersions).distinct - val runnerScalaVersions = runnerScala3 +: allScala2 + val allScala2 = Seq(scala213, scala212) + val defaults = Seq(defaultInternal, defaultUser).distinct + val allScala3 = Seq(scala3Lts, scala3Next, scala3NextAnnounced, scala3NextRc).distinct + val all = (allScala2 ++ allScala3 ++ defaults).distinct + val scala3MainVersions = (defaults ++ allScala3).distinct + val mainVersions = (Seq(scala213) ++ scala3MainVersions).distinct + val runnerScalaVersions = runnerScala3 +: allScala2 val testRunnerScalaVersions = runnerScalaVersions ++ allScala3 def scalaJs = "1.16.0" @@ -53,7 +53,7 @@ object Scala { def maxAmmoniteScala212Version = scala212 def maxAmmoniteScala213Version = "2.13.14" - def maxAmmoniteScala3Version = scala3NextAnnounced + def maxAmmoniteScala3Version = "3.5.0" lazy val listMaxAmmoniteScalaVersion = Seq(maxAmmoniteScala212Version, maxAmmoniteScala213Version, maxAmmoniteScala3Version) lazy val listAllAmmonite = {