Upgrade Scala to 2.13

.travis.yml

@@ -3,6 +3,7 @@ language: scala
 dist: xenial
 
 scala:
+  - 2.13.0
   - 2.12.8
   - 2.11.12
 
@@ -31,4 +32,4 @@ cache:
   directories:
     - $HOME/.ivy2/cache
     - $HOME/.coursier/cache
-    - $HOME/.sbt
+    - $HOME/.sbt

build.sbt

@@ -4,8 +4,9 @@ enablePlugins(MicrositesPlugin)
 
 val CatsVersion = "2.0.0"
 val CatsEffectVersion = "2.0.0"
-val ScalaTestVersion = "3.0.8"
+val ScalaTestVersion = "3.1.0-RC2"
 val ScalaCheckVersion = "1.14.0"
+val ScalaTestPlusScalaCheck = "3.1.0.0-RC2"
 val ScalaJava8CompatVersion = "0.9.0"
 
 lazy val `cats-stm` = project.in(file("."))
@@ -36,23 +37,23 @@ lazy val commonSettings = Seq(
   organization := "io.github.timwspence",
   organizationName := "timwspence",
   organizationHomepage := Some(url("https://github.com/TimWSpence")),
-  scalaVersion := "2.12.8",
-  crossScalaVersions := Seq("2.11.12", scalaVersion.value),
+  scalaVersion := "2.13.0",
+  crossScalaVersions := Seq("2.11.12", "2.12.10", scalaVersion.value),
   scalacOptions ++= Seq(
     "-deprecation",
     "-encoding", "UTF-8",
     "-language:higherKinds",
     "-language:postfixOps",
     "-feature",
-    "-Ypartial-unification",
     "-Xfatal-warnings",
   ),
   libraryDependencies ++= Seq(
-    "org.typelevel"          %% "cats-effect"        % CatsEffectVersion,
-    "org.typelevel"          %% "cats-core"          % CatsVersion,
-    "org.scalatest"          %% "scalatest"          % ScalaTestVersion  % "test",
-    "org.scalacheck"         %% "scalacheck"         % ScalaCheckVersion % "test",
-    "org.scala-lang.modules" %% "scala-java8-compat" % ScalaJava8CompatVersion,
+    "org.typelevel"          %% "cats-effect"              % CatsEffectVersion,
+    "org.typelevel"          %% "cats-core"                % CatsVersion,
+    "org.scalatest"          %% "scalatest"                % ScalaTestVersion % Test,
+    "org.scalacheck"         %% "scalacheck"               % ScalaCheckVersion % Test,
+    "org.scalatestplus"      %% "scalatestplus-scalacheck" % ScalaTestPlusScalaCheck % Test,
+    "org.scala-lang.modules" %% "scala-java8-compat"       % ScalaJava8CompatVersion,
   ),
   addCompilerPlugin("org.typelevel" % "kind-projector" % "0.10.3" cross CrossVersion.binary),
   addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
@@ -124,7 +125,6 @@ lazy val micrositeSettings = {
       "-Ywarn-unused:imports",
       "-Xlint:-missing-interpolator,_"
     ),
-    libraryDependencies += "com.47deg" %% "github4s" % "0.20.1",
     micrositePushSiteWith := GitHub4s,
     micrositeGithubToken := sys.env.get("GITHUB_TOKEN"),
     micrositeExtraMdFiles := Map(

core/src/test/scala/io/github/timwspence/cats/stm/PropertyTests.scala

@@ -5,7 +5,8 @@ import cats.instances.list._
 import cats.syntax.functor._
 import cats.syntax.traverse._
 import org.scalacheck._
-import org.scalatest.{FunSuite, Matchers}
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.funsuite.AnyFunSuite
 import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 import scala.concurrent.ExecutionContext
@@ -18,7 +19,7 @@ import scala.util.Random
   * adds the same amount to another tvar. The sum of the tvar values
   * should be invariant under the execution of all these transactions.
   */
-class MaintainsInvariants extends FunSuite with ScalaCheckDrivenPropertyChecks with Matchers {
+class MaintainsInvariants extends AnyFunSuite with ScalaCheckDrivenPropertyChecks with Matchers {
   implicit val executionContext: ExecutionContext = ExecutionContext.Implicits.global
 
   implicit val timer: Timer[IO] = IO.timer(executionContext)

core/src/test/scala/io/github/timwspence/cats/stm/SequentialTests.scala

@@ -1,7 +1,8 @@
 package io.github.timwspence.cats.stm
 
 import cats.effect.{ContextShift, Fiber, IO, Timer}
-import org.scalatest.{AsyncFunSuite, Matchers}
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.funsuite.AsyncFunSuite
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.duration._

core/src/test/scala/io/github/timwspence/cats/stm/TMVarTest.scala

@@ -1,7 +1,8 @@
 package io.github.timwspence.cats.stm
 
 import cats.effect.{ContextShift, IO, Timer}
-import org.scalatest.{AsyncFunSuite, Matchers}
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.funsuite.AsyncFunSuite
 
 import scala.concurrent.ExecutionContext
 

core/src/test/scala/io/github/timwspence/cats/stm/TQueueTest.scala

@@ -3,7 +3,8 @@ package io.github.timwspence.cats.stm
 import cats.effect.{ContextShift, IO, Timer}
 import cats.instances.string._
 import cats.syntax.semigroup._
-import org.scalatest.{AsyncFunSuite, Matchers}
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.funsuite.AsyncFunSuite 
 
 import scala.concurrent.ExecutionContext
 

core/src/test/scala/io/github/timwspence/cats/stm/TSemaphoreTest.scala

@@ -1,7 +1,8 @@
 package io.github.timwspence.cats.stm
 
 import cats.effect.{ContextShift, IO, Timer}
-import org.scalatest.{AsyncFunSuite, Matchers}
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.funsuite.AsyncFunSuite
 
 import scala.concurrent.ExecutionContext
 

core/src/test/scala/io/github/timwspence/cats/stm/TVarTest.scala

@@ -1,7 +1,8 @@
 package io.github.timwspence.cats.stm
 
 import cats.effect.{ContextShift, IO, Timer}
-import org.scalatest.{AsyncFunSuite, Matchers}
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.funsuite.AsyncFunSuite 
 
 import scala.concurrent.ExecutionContext
 

docs/src/main/tut/index.md

@@ -56,7 +56,6 @@ object Main extends IOApp {
 
 }
 
-// Run The Application
 Main.run(List()).unsafeRunSync
 ```