Skip to content

Commit 986fe35

Browse files
committed
IntelliJ 2024.3 support
1 parent 3ad0fbd commit 986fe35

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/test/scala/org/jetbrains/plugins/scala/base/ScalaSdkOwner.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jetbrains.plugins.scala.base
22

33
import com.intellij.util.containers.ContainerUtil
4-
import _root_.junit.framework.{AssertionFailedError, Test, TestListener, TestResult}
4+
import junit.framework.{AssertionFailedError, Test, TestListener, TestResult}
55
import org.jetbrains.plugins.scala.{LatestScalaVersions, ScalaVersion}
66

77
import scala.collection.immutable.SortedSet
@@ -23,7 +23,7 @@ trait ScalaSdkOwner extends Test
2323
val defaultVersion = defaultVersionOverride.getOrElse(defaultSdkVersion)
2424
val selectedVersion = selectVersion(defaultVersion, supportedVersions)
2525
selectedVersion.orElse(
26-
ScalaVersion.Latest.scalaNext.find(supportedIn)
26+
(ScalaVersion.Latest.allScalaNext ++ ScalaVersion.Latest.allReleaseCandidates).find(supportedIn)
2727
).getOrElse(sys.error("Could not find a Scala version matching the test criteria"))
2828
}
2929
}
@@ -90,7 +90,7 @@ object ScalaSdkOwner {
9090
// that should already work in newest version (SCL-15634)
9191
val defaultSdkVersion: ScalaVersion = LatestScalaVersions.Scala_2_10 // ScalaVersion.default
9292
val preferableSdkVersion: ScalaVersion = LatestScalaVersions.Scala_2_13
93-
val allTestVersions: SortedSet[ScalaVersion] = SortedSet.from(LatestScalaVersions.all.flatMap(_.generateAllMinorVersions()))
93+
val allTestVersions: SortedSet[ScalaVersion] = SortedSet.from(LatestScalaVersions.allStableWithoutScalaNext.flatMap(_.generateAllMinorVersions()))
9494

9595
private def selectVersion(wantedVersion: ScalaVersion, possibleVersions0: SortedSet[ScalaVersion]): Option[ScalaVersion] = {
9696
val possibleVersions = possibleVersions0.iteratorFrom(wantedVersion).toSeq

src/test/scala/org/jetbrains/plugins/scala/util/runners/TestScalaVersion.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ public enum TestScalaVersion {
1515
Scala_3_3,
1616
Scala_3_4,
1717
Scala_3_Latest,
18-
Scala_3_Latest_RC
18+
Scala_3_Latest_RC,
19+
Scala_3_Next_RC
1920
;
2021

2122
public org.jetbrains.plugins.scala.ScalaVersion toProductionVersion() {
@@ -37,7 +38,8 @@ public org.jetbrains.plugins.scala.ScalaVersion toProductionVersion() {
3738
case Scala_3_3 -> LatestScalaVersions.Scala_3_3();
3839
case Scala_3_4 -> LatestScalaVersions.Scala_3_4();
3940
case Scala_3_Latest -> LatestScalaVersions.Scala_3();
40-
case Scala_3_Latest_RC -> LatestScalaVersions.Scala_3_RC();
41+
case Scala_3_Latest_RC -> LatestScalaVersions.Scala_3_LTS_RC();
42+
case Scala_3_Next_RC -> LatestScalaVersions.Scala_3_Next_RC();
4143
};
4244
}
4345
}

0 commit comments

Comments
 (0)