Set Scala 3.6.1 as the Next RC version (which it effectively is) (#3244)

VirtusLab · Oct 25, 2024 · c083024 · c083024
1 parent 7751341
commit c083024
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala
@@ -1880,7 +1880,10 @@ abstract class RunTestDefinitions
     }
   }
 
-  if (!actualScalaVersion.contains("RC")) {
+  if (
+    !actualScalaVersion.contains("RC") &&
+    actualScalaVersion != "3.6.0" && actualScalaVersion != "3.6.1"
+  ) {
     val actualAnnouncedScalaVersion = actualScalaVersion match {
       case _
           if actualScalaVersion == Constants.scala3Next &&

diff --git a/project/deps.sc b/project/deps.sc
@@ -9,8 +9,8 @@ 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.2"               // the newest/next version of Scala
-  def scala3NextAnnounced = scala3Next  // the newest/next version of Scala that's been announced
-  def scala3NextRc        = "3.5.2-RC2" // the latest RC version of Scala Next
+  def scala3NextAnnounced = scala3Next // the newest/next version of Scala that's been announced
+  def scala3NextRc        = "3.6.1"    // the latest RC version of Scala Next
 
   // The Scala version used to build the CLI itself.
   def defaultInternal = sys.props.get("scala.version.internal").getOrElse(scala3Lts)