Merge pull request #107 from Sciss/work

support for Scala 2.13.0-RC2
scala · May 16, 2019 · 6ee0fac · 6ee0fac
2 parents 127d62f + 27a437f
commit 6ee0fac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,5 @@
+dist: trusty
+
 language: scala
 
 env:

diff --git a/build.sbt b/build.sbt
@@ -10,11 +10,11 @@ scalacOptions in ThisBuild ++= Seq("-deprecation", "-feature")
 
 // Map[JvmMajorVersion, List[(ScalaVersion, UseForPublishing)]]
 scalaVersionsByJvm in ThisBuild := Map(
-   8 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> true),
-   9 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false),
-  10 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false),
-  11 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false),
-  12 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false)
+   8 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> true),
+   9 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false),
+  10 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false),
+  11 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false),
+  12 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false)
 )
 
 scalaVersion in ThisBuild := "2.12.8"
@@ -29,7 +29,11 @@ shellPrompt in ThisBuild := { state => Project.extract(state).currentRef.project
 lazy val swing = project.in(file("."))
   .settings(
     libraryDependencies += {
-      "org.scalatest" %% "scalatest" % "3.0.8-RC2" % Test
+      if (scalaVersion.value == "2.13.0-RC2") {
+        "org.scalatest" % "scalatest_2.13.0-RC1" % "3.0.8-RC2" % Test  // it works
+      } else {
+        "org.scalatest" %% "scalatest" % "3.0.8-RC2" % Test
+      }
     },
     // Adds a `src/main/scala-2.13+` source directory for Scala 2.13 and newer
     // and  a `src/main/scala-2.13-` source directory for Scala version older than 2.13