Skip to content

Commit 6ee0fac

Browse files
authored
Merge pull request #107 from Sciss/work
support for Scala 2.13.0-RC2
2 parents 127d62f + 27a437f commit 6ee0fac

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
dist: trusty
2+
13
language: scala
24

35
env:

build.sbt

+10-6
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ scalacOptions in ThisBuild ++= Seq("-deprecation", "-feature")
1010

1111
// Map[JvmMajorVersion, List[(ScalaVersion, UseForPublishing)]]
1212
scalaVersionsByJvm in ThisBuild := Map(
13-
8 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> true),
14-
9 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false),
15-
10 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false),
16-
11 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false),
17-
12 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false)
13+
8 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> true),
14+
9 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false),
15+
10 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false),
16+
11 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false),
17+
12 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false)
1818
)
1919

2020
scalaVersion in ThisBuild := "2.12.8"
@@ -29,7 +29,11 @@ shellPrompt in ThisBuild := { state => Project.extract(state).currentRef.project
2929
lazy val swing = project.in(file("."))
3030
.settings(
3131
libraryDependencies += {
32-
"org.scalatest" %% "scalatest" % "3.0.8-RC2" % Test
32+
if (scalaVersion.value == "2.13.0-RC2") {
33+
"org.scalatest" % "scalatest_2.13.0-RC1" % "3.0.8-RC2" % Test // it works
34+
} else {
35+
"org.scalatest" %% "scalatest" % "3.0.8-RC2" % Test
36+
}
3337
},
3438
// Adds a `src/main/scala-2.13+` source directory for Scala 2.13 and newer
3539
// and a `src/main/scala-2.13-` source directory for Scala version older than 2.13

0 commit comments

Comments
 (0)