1
1
package org .jetbrains .plugins .scala .base
2
2
3
3
import com .intellij .util .containers .ContainerUtil
4
- import _root_ . junit .framework .{AssertionFailedError , Test , TestListener , TestResult }
4
+ import junit .framework .{AssertionFailedError , Test , TestListener , TestResult }
5
5
import org .jetbrains .plugins .scala .{LatestScalaVersions , ScalaVersion }
6
6
7
7
import scala .collection .immutable .SortedSet
@@ -23,7 +23,7 @@ trait ScalaSdkOwner extends Test
23
23
val defaultVersion = defaultVersionOverride.getOrElse(defaultSdkVersion)
24
24
val selectedVersion = selectVersion(defaultVersion, supportedVersions)
25
25
selectedVersion.orElse(
26
- ScalaVersion .Latest .scalaNext .find(supportedIn)
26
+ ( ScalaVersion .Latest .allScalaNext ++ ScalaVersion . Latest .allReleaseCandidates) .find(supportedIn)
27
27
).getOrElse(sys.error(" Could not find a Scala version matching the test criteria" ))
28
28
}
29
29
}
@@ -90,7 +90,7 @@ object ScalaSdkOwner {
90
90
// that should already work in newest version (SCL-15634)
91
91
val defaultSdkVersion : ScalaVersion = LatestScalaVersions .Scala_2_10 // ScalaVersion.default
92
92
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()))
94
94
95
95
private def selectVersion (wantedVersion : ScalaVersion , possibleVersions0 : SortedSet [ScalaVersion ]): Option [ScalaVersion ] = {
96
96
val possibleVersions = possibleVersions0.iteratorFrom(wantedVersion).toSeq
0 commit comments