Merge pull request #3671 from Gedochao/update/scala-3.3.6

Bump Scala 3 LTS to 3.3.6

Author: Gedochao

.github/release/release-procedure.md

@@ -24,13 +24,13 @@
     - [ ] Wait for the `Update dist` PR to be automatically created after the previous one has been merged, and then
       proceed to merge it.
     - [ ] Make a release with the updated Scala CLI version.
-    - [ ] Update the `v1` & `v1.7` tags to the latest release commit.
+    - [ ] Update the `v1` & `v1.8` tags to the latest release commit.
       ```bash
       git fetch --all
-      git checkout origin v1.7.x
-      git tag -d v1.7
-      git tag v1.7
-      git push origin v1.7 -f 
+      git checkout origin v1.8.x
+      git tag -d v1.8
+      git tag v1.8
+      git push origin v1.8 -f 
       git tag -d v1
       git tag v1
       git push origin v1 -f

modules/cli/src/main/scala/scala/cli/commands/repl/Repl.scala

@@ -75,18 +75,18 @@ object Repl extends ScalaCommand[ReplOptions] with BuildCommandHelpers {
     val maybeDowngradedScalaVersion = {
       val isDefaultAmmonite = ammonite.contains(true) && ammoniteVersionOpt.isEmpty
       extension (s: MaybeScalaVersion)
-        private def isLts: Boolean = s.versionOpt
-          .exists(v =>
-            v.startsWith(Constants.scala3LtsPrefix) ||
-            ScalaVersionUtil.scala3Lts.contains(v.toLowerCase)
-          )
+        private def isLtsAlias: Boolean =
+          s.versionOpt.exists(v => ScalaVersionUtil.scala3Lts.contains(v.toLowerCase))
+        private def isLts: Boolean =
+          s.versionOpt.exists(_.startsWith(Constants.scala3LtsPrefix)) || isLtsAlias
       baseOptions.scalaOptions.scalaVersion match
         case Some(s)
-            if isDefaultAmmonite && s.isLts && s.versionOpt
-              .exists(_.coursierVersion > maxAmmoniteScalaLtsVer.coursierVersion) =>
-          logger.message(
-            s"Scala ${s.versionOpt.getOrElse(Constants.scala3Lts)} is not yet supported with this version of Ammonite"
-          )
+            if isDefaultAmmonite && s.isLts &&
+            (s.versionOpt
+              .exists(_.coursierVersion > maxAmmoniteScalaLtsVer.coursierVersion) ||
+            s.isLtsAlias) =>
+          val versionString = s.versionOpt.filter(_ => !s.isLtsAlias).getOrElse(Constants.scala3Lts)
+          logger.message(s"Scala $versionString is not yet supported with this version of Ammonite")
           logger.message(s"Defaulting to Scala $maxAmmoniteScalaLtsVer")
           Some(MaybeScalaVersion(maxAmmoniteScalaLtsVer))
         case None

project/deps.sc

@@ -10,7 +10,7 @@ object Scala {
   def scala212         = "2.12.20"
   def scala213         = "2.13.16"
   def scala3LtsPrefix  = "3.3"                  // used for the LTS version tags
-  def scala3Lts        = s"$scala3LtsPrefix.5"  // the LTS version currently used in the build
+  def scala3Lts        = s"$scala3LtsPrefix.6"  // the LTS version currently used in the build
   def runnerScala3     = scala3Lts
   def scala3NextPrefix = "3.7"
   def scala3Next       = s"$scala3NextPrefix.0" // the newest/next version of Scala
@@ -74,7 +74,7 @@ object Scala {
   def maxAmmoniteScala212Version  = scala212
   def maxAmmoniteScala213Version  = scala213
   def maxAmmoniteScala3Version    = "3.6.3"
-  def maxAmmoniteScala3LtsVersion = scala3Lts
+  def maxAmmoniteScala3LtsVersion = "3.3.5"
   lazy val listMaxAmmoniteScalaVersion =
     Seq(maxAmmoniteScala212Version, maxAmmoniteScala213Version, maxAmmoniteScala3Version)
   lazy val listAllAmmonite = {

website/docs/release_notes.md

@@ -10,16 +10,17 @@ import ReactPlayer from 'react-player'
 
 ## [v1.8.0](https://github.com/VirtusLab/scala-cli/releases/tag/v1.8.0)
 
-### Support for Scala 3.7.0
+### Support for Scala 3.7.0 and 3.3.6
 This Scala CLI version switches the default Scala version to 3.7.0.
+The CLI internals are now built with Scala 3.3.6.
 
 ```bash
 scala-cli version
 # Scala CLI version: 1.8.0
 # Scala version (default): 3.7.0
 ```
 
-Added by [@Gedochao](https://github.com/Gedochao) in [#3661](https://github.com/VirtusLab/scala-cli/pull/3661)
+Added by [@Gedochao](https://github.com/Gedochao) in [#3661](https://github.com/VirtusLab/scala-cli/pull/3661) and [#3671](https://github.com/VirtusLab/scala-cli/pull/3671)
 
 ### Support for Scala.js 1.19.0
 This Scala CLI version adds support for Scala.js 1.19.0.
@@ -188,6 +189,8 @@ Added by [@Gedochao](https://github.com/Gedochao) in [#3653](https://github.com/
 * Bump Scala 3 Next RC to 3.7.1-RC1 by [@Gedochao](https://github.com/Gedochao) in [#3663](https://github.com/VirtusLab/scala-cli/pull/3663)
 * Update `runner` & `test-runner` to Scala 3.3.5 LTS (was 3.0.2) by [@Gedochao](https://github.com/Gedochao) in [#3650](https://github.com/VirtusLab/scala-cli/pull/3650)
 * Update `scalafmt` to 3.9.6 by [@scala-steward](https://github.com/scala-steward) in [#3667](https://github.com/VirtusLab/scala-cli/pull/3667)
+* chore: Bump Bloop to 2.0.10 by [@tgodzik](https://github.com/tgodzik) in [#3670](https://github.com/VirtusLab/scala-cli/pull/3670)
+* Bump Scala 3 LTS to 3.3.6 by [@Gedochao](https://github.com/Gedochao) in [#3671](https://github.com/VirtusLab/scala-cli/pull/3671)
 
 **Full Changelog**: https://github.com/VirtusLab/scala-cli/compare/v1.7.1...v1.8.0