Skip to content

Commit c083024

Browse files
authored
Set Scala 3.6.1 as the Next RC version (which it effectively is) (#3244)
1 parent 7751341 commit c083024

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala

+4-1
Original file line numberDiff line numberDiff line change
@@ -1880,7 +1880,10 @@ abstract class RunTestDefinitions
18801880
}
18811881
}
18821882

1883-
if (!actualScalaVersion.contains("RC")) {
1883+
if (
1884+
!actualScalaVersion.contains("RC") &&
1885+
actualScalaVersion != "3.6.0" && actualScalaVersion != "3.6.1"
1886+
) {
18841887
val actualAnnouncedScalaVersion = actualScalaVersion match {
18851888
case _
18861889
if actualScalaVersion == Constants.scala3Next &&

project/deps.sc

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ object Scala {
99
def scala3LtsPrefix = "3.3" // used for the LTS version tags
1010
def scala3Lts = s"$scala3LtsPrefix.4" // the LTS version currently used in the build
1111
def scala3Next = "3.5.2" // the newest/next version of Scala
12-
def scala3NextAnnounced = scala3Next // the newest/next version of Scala that's been announced
13-
def scala3NextRc = "3.5.2-RC2" // the latest RC version of Scala Next
12+
def scala3NextAnnounced = scala3Next // the newest/next version of Scala that's been announced
13+
def scala3NextRc = "3.6.1" // the latest RC version of Scala Next
1414

1515
// The Scala version used to build the CLI itself.
1616
def defaultInternal = sys.props.get("scala.version.internal").getOrElse(scala3Lts)

0 commit comments

Comments
 (0)