enable Scala 2.13.0-M3 test

foundweekends · Feb 14, 2018 · b5e3cd2 · b5e3cd2
1 parent 056066f
commit b5e3cd2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ scala:
 - 2.10.7
 - 2.11.12
 - 2.12.4
+- 2.13.0-M3
 jdk:
 - oraclejdk8
 script:
@@ -12,10 +13,6 @@ matrix:
   include:
   - scala: 2.12.4
     jdk: oraclejdk9
-  - scala: 2.13.0-M3
-    script:
-    # TODO enable test https://github.com/scalatest/scalatest/issues/1321
-    - sbt "++${TRAVIS_SCALA_VERSION}! -v" compile
 cache:
   directories:
   - $HOME/.ivy2/cache

diff --git a/build.sbt b/build.sbt
@@ -72,19 +72,9 @@ val knockoff = crossProject(JVMPlatform, JSPlatform)
     name := "knockoff",
     libraryDependencies ++= Seq(
       "junit" % "junit" % "4.12" % "test",
+      "org.scalatest" %%% "scalatest" % "3.0.5-M1" % "test",
       "net.sf.jtidy" % "jtidy" % "r938" % "test"
     ),
-    // TODO enable test https://github.com/scalatest/scalatest/issues/1321
-    libraryDependencies ++= {
-      CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((2, v)) if v <= 12 =>
-          Seq(
-            "org.scalatest" %%% "scalatest" % "3.0.5" % "test",
-          )
-        case _ =>
-          Nil
-      }
-    },
     publishMavenStyle := true,
     publishTo := {
       val nexus = "https://oss.sonatype.org/"