Merged branch idea243.release-vasil/test-versions into idea243.release

JetBrains · Jan 17, 2025 · 7ab17a4 · 7ab17a4
2 parents b976b36 + 2e57f07
commit 7ab17a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...on/test/org/jetbrains/plugins/scala/compiler/highlighting/CompilerDiagnosticsTest_3.scala b/...on/test/org/jetbrains/plugins/scala/compiler/highlighting/CompilerDiagnosticsTest_3.scala
@@ -277,3 +277,7 @@ class CompilerDiagnosticsTest_3 extends ScalaCompilerHighlightingTestBase with C
 class CompilerDiagnosticsTest_3_5 extends CompilerDiagnosticsTest_3 {
   override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_5
 }
+
+class CompilerDiagnosticsTest_3_6 extends CompilerDiagnosticsTest_3 {
+  override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_6
+}
diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/ScalaVersion.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/ScalaVersion.scala
@@ -102,7 +102,7 @@ object LatestScalaVersions {
   val Scala_3_3 = new ScalaVersion(ScalaLanguageLevel.Scala_3_3, "4")
   val Scala_3_4 = new ScalaVersion(ScalaLanguageLevel.Scala_3_4, "2")
   val Scala_3_5 = new ScalaVersion(ScalaLanguageLevel.Scala_3_5, "2")
-  val Scala_3_6 = new ScalaVersion(ScalaLanguageLevel.Scala_3_6, "2")
+  val Scala_3_6 = new ScalaVersion(ScalaLanguageLevel.Scala_3_6, "3")
 
   //
   // Aliases
@@ -115,7 +115,7 @@ object LatestScalaVersions {
   // Release candidates
   //
   // Scala LTS RC
-  val Scala_3_LTS_RC: ScalaVersion = Scala_3_3.withMinor("5-RC1")
+  val Scala_3_LTS_RC: ScalaVersion = Scala_3_3.withMinor("5-RC2")
 
   // Scala Next RC
   val Scala_3_Next_RC = new ScalaVersion(ScalaLanguageLevel.Scala_3_6, "3-RC2")