WIP: Support Scala 2.13.0-RC2

typelevel · May 26, 2019 · 3a0b30c · 3a0b30c
1 parent e081648
commit 3a0b30c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: scala
 
 scala:
   - 2.11.12
-  - 2.13.0-RC1
+  - 2.13.0-RC2
   - 2.12.7
 
 jdk:
@@ -28,7 +28,7 @@ script:
   - sbt ++$TRAVIS_SCALA_VERSION -Dfile.encoding=UTF8 -Dfs2.test.verbose testJVM
   - sbt ++$TRAVIS_SCALA_VERSION -Dfile.encoding=UTF8 -Dfs2.test.verbose testJS
   - sbt ++$TRAVIS_SCALA_VERSION -Dfile.encoding=UTF8 doc mimaReportBinaryIssues
-  - (test $TRAVIS_SCALA_VERSION == "2.11.12" && sbt ++$TRAVIS_SCALA_VERSION -Dfile.encoding=UTF8 -J-Xms2g -J-Xmx2g docs/tut) || test $TRAVIS_SCALA_VERSION == "2.12.7" || test $TRAVIS_SCALA_VERSION == "2.13.0-RC1"
+  - (test $TRAVIS_SCALA_VERSION == "2.11.12" && sbt ++$TRAVIS_SCALA_VERSION -Dfile.encoding=UTF8 -J-Xms2g -J-Xmx2g docs/tut) || test $TRAVIS_SCALA_VERSION == "2.12.7" || test $TRAVIS_SCALA_VERSION == "2.13.0-RC2"
 
 after_success:
   - test $PUBLISH == "true" && test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "series/1.0" && GPG_WARN_ON_FAILURE=true sbt +publish

diff --git a/build.sbt b/build.sbt
@@ -49,20 +49,13 @@ lazy val commonSettings = Seq(
   javaOptions in (Test, run) ++= Seq("-Xms64m", "-Xmx64m"),
   libraryDependencies ++= Seq(
     compilerPlugin("org.typelevel" %% "kind-projector" % "0.10.0"),
-    "org.typelevel" %%% "cats-core" % "2.0.0-M1",
-    "org.typelevel" %%% "cats-laws" % "2.0.0-M1" % "test",
-    "org.typelevel" %%% "cats-effect" % "2.0.0-M1",
-    "org.typelevel" %%% "cats-effect-laws" % "2.0.0-M1" % "test",
-    "org.scalatest" %%% "scalatest" % "3.0.8-RC2" % "test"
+    "org.typelevel" %%% "cats-core" % "2.0.0-M2",
+    "org.typelevel" %%% "cats-laws" % "2.0.0-M2" % "test",
+    "org.typelevel" %%% "cats-effect" % "2.0.0-M2",
+    "org.typelevel" %%% "cats-effect-laws" % "2.0.0-M2" % "test",
+    "org.scalacheck" %%% "scalacheck" % "1.14.0" % "test",
+    "org.scalatest" %%% "scalatest" % "3.1.0-SNAP11" % "test"
   ),
-  libraryDependencies += {
-    CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, v)) if v >= 13 =>
-        "org.scalacheck" %%% "scalacheck" % "1.14.0" % "test"
-      case _ =>
-        "org.scalacheck" %%% "scalacheck" % "1.13.5" % "test"
-    }
-  },
   scmInfo := Some(ScmInfo(url("https://github.com/functional-streams-for-scala/fs2"),
                           "git@github.com:functional-streams-for-scala/fs2.git")),
   homepage := Some(url("https://github.com/functional-streams-for-scala/fs2")),
@@ -73,7 +66,7 @@ lazy val commonSettings = Seq(
     implicit val contextShiftIO: ContextShift[IO] = IO.contextShift(global)
     implicit val timerIO: Timer[IO] = IO.timer(global)
   """,
-  doctestTestFramework := DoctestTestFramework.ScalaTest,
+  doctestTestFramework := DoctestTestFramework.ScalaCheck,
   scalafmtOnCompile := true
 ) ++ testSettings ++ scaladocSettings ++ publishingSettings ++ releaseSettings
 

diff --git a/core/shared/src/test/scala/fs2/Fs2Spec.scala b/core/shared/src/test/scala/fs2/Fs2Spec.scala
@@ -6,12 +6,13 @@ import scala.concurrent.duration._
 import cats.effect.{ContextShift, IO, Timer}
 
 import org.typelevel.discipline.Laws
-import org.scalatest.{ Args, Assertion, AsyncFreeSpec, FreeSpec, Matchers, Status, Succeeded, Suite }
+import org.scalatest.{ Args, Assertion, Matchers, Status, Succeeded, Suite }
 import org.scalatest.concurrent.{ AsyncTimeLimitedTests, TimeLimitedTests }
+import org.scalatest.freespec.{ AnyFreeSpec, AsyncFreeSpec }
 import org.scalatestplus.scalacheck.{ Checkers, ScalaCheckDrivenPropertyChecks }
 import org.scalatest.time.Span
 
-abstract class Fs2Spec extends FreeSpec with Fs2SpecLike with TimeLimitedTests with Checkers {
+abstract class Fs2Spec extends AnyFreeSpec with Fs2SpecLike with TimeLimitedTests with Checkers {
   val timeLimit: Span = timeout
 
   def checkAll(name: String, ruleSet: Laws#RuleSet): Unit =