Skip to content

Commit 4d08d1e

Browse files
committed
DRY scala versions
1 parent a3cdd42 commit 4d08d1e

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

build.sc

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,18 @@ val scala212 = "2.12.13"
55
val scala213 = "2.13.4"
66
val scala3 = "3.0.0-M3"
77

8+
val dottyVersions = sys.props.get("dottyVersion").toList
9+
10+
val scalaVersions = "2.11.12" :: "2.12.13" :: "2.13.4" :: "3.0.0-M3" :: dottyVersions
11+
val scala2Versions = scalaVersions.filter(_.startsWith("2."))
12+
813
val scalaJSVersions = for {
9-
scalaV <- Seq(scala213, scala212)
14+
scalaV <- scala2Versions
1015
scalaJSV <- Seq("0.6.33", "1.4.0")
1116
} yield (scalaV, scalaJSV)
1217

1318
val scalaNativeVersions = for {
14-
scalaV <- Seq(scala213, scala212)
19+
scalaV <- scala2Versions
1520
scalaNativeV <- Seq("0.4.0")
1621
} yield (scalaV, scalaNativeV)
1722

@@ -79,7 +84,7 @@ trait SourcecodeTestModule extends ScalaModule {
7984

8085
object sourcecode extends Module {
8186
val dottyVersion = sys.props.get("dottyVersion")
82-
object jvm extends Cross[JvmSourcecodeModule]((scala211 :: scala212 :: scala213 :: scala3 :: dottyVersion.toList): _*)
87+
object jvm extends Cross[JvmSourcecodeModule](scalaVersions: _*)
8388
class JvmSourcecodeModule(val crossScalaVersion: String)
8489
extends SourcecodeMainModule with ScalaModule with SourcecodeModule {
8590

0 commit comments

Comments
 (0)