enable Scala 2.13.0-M4 test

sbt · Jun 16, 2018 · 14a68b7 · 14a68b7
1 parent e961aaf
commit 14a68b7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -47,14 +47,16 @@ matrix:
      osx_image: xcode9.3
 
    - scala: 2.13.0-M4
-     env: CMD=compile
+     env:
+       CMD="scalafmt::test test:scalafmt::test sbt:scalafmt::test test"
+       TRAVIS_SCALA_VERSION=2.13.0-M4
      os: linux
      dist: trusty
 
    - scala: 2.13.0-M4
      os: osx
      env:
-       CMD="compile"
+       CMD="scalafmt::test test:scalafmt::test sbt:scalafmt::test test"
        TRAVIS_SCALA_VERSION=2.13.0-M4
      language: java
      osx_image: xcode9.3

diff --git a/build.sbt b/build.sbt
@@ -31,8 +31,7 @@ val io = (project in file("io"))
     commonSettings,
     name := "IO",
     libraryDependencies ++= {
-      if (scalaVersion.value startsWith "2.13.") Vector()
-      else Vector(scalaCompiler.value % Test, scalaCheck % Test, scalatest % Test)
+      Vector(scalaCompiler.value % Test, scalaCheck % Test, scalatest.value % Test)
     } ++ Vector(appleFileEvents),
     libraryDependencies ++= Seq(jna, jnaPlatform),
     sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -10,7 +10,12 @@ object Dependencies {
   val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value }
 
   val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
-  val scalatest = "org.scalatest" %% "scalatest" % "3.0.5-M1"
+  val scalatest = Def.setting {
+    if (scalaVersion.value == "2.13.0-M4")
+      "org.scalatest" %% "scalatest" % "3.0.6-SNAP1"
+    else
+      "org.scalatest" %% "scalatest" % "3.0.5-M1"
+  }
   val jna = "net.java.dev.jna" % "jna" % "4.5.0"
   val jnaPlatform = "net.java.dev.jna" % "jna-platform" % "4.5.0"
   val appleFileEvents = "com.swoval" % "apple-file-events" % "1.3.2"