Merge pull request #1 from ThoughtWorksInc/scala-2.13.0

Upgrade dependencies and cross build for Scala 2.13.0

.travis.yml

@@ -10,7 +10,7 @@ language: scala
 scala:
   - 2.11.12
   - 2.12.8
-  - 2.13.0-M4
+  - 2.13.0
 
 jdk:
   - openjdk8

domains-cats/.jvm/jvm.sbt

@@ -3,7 +3,7 @@ enablePlugins(Example)
 
 import Ordering.Implicits._
 
-libraryDependencies += "org.typelevel" %%% "cats-effect" % "1.0.0" % Optional
+libraryDependencies += "org.typelevel" %%% "cats-effect" % "2.0.0-M4" % Optional
 
 sourceGenerators in Test := {
   (sourceGenerators in Test).value.filterNot { sourceGenerator =>

domains-cats/build.sbt

@@ -1,25 +1,24 @@
-libraryDependencies += "org.typelevel" %%% "cats-free" % "1.4.0" % Test
+libraryDependencies += "org.typelevel" %%% "cats-free" % "2.0.0-M4" % Test
 
-libraryDependencies += "org.typelevel" %%% "cats-free" % "1.4.0" % Optional // For Scaladoc
+libraryDependencies += "org.typelevel" %%% "cats-free" % "2.0.0-M4" % Optional // For Scaladoc
 
-libraryDependencies += "org.typelevel" %%% "cats-core" % "1.4.0"
+libraryDependencies += "org.typelevel" %%% "cats-core" % "2.0.0-M4"
 
-libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.6-SNAP2" % Test
+libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.8" % Test
 
-libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-catch" % "1.3.1"
+libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-catch" % "1.3.2"
 
-libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-monadic" % "1.3.1"
+libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-monadic" % "1.3.2"
 
-libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-return" % "1.3.1"
+libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-return" % "1.3.2"
 
-libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-shift" % "1.3.1" % Optional
+libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-shift" % "1.3.2" % Optional
 
-libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-yield" % "1.3.1" % Optional
+libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-yield" % "1.3.2" % Optional
 
-addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-bangnotation" % "1.3.1")
-
-addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-reseteverywhere" % "1.3.1")
+addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-bangnotation" % "1.3.2")
 
+addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-reseteverywhere" % "1.3.2")
 
 scalacOptions ++= {
   import Ordering.Implicits._

project/plugins.sbt

@@ -12,6 +12,4 @@ addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "6.0.1")
 
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
 
-dependencyOverrides += sbt.Defaults.sbtPluginExtra("org.scala-js" % "sbt-scalajs" % "0.6.26",
-                                                   (pluginCrossBuild / sbtBinaryVersion).value,
-                                                   (update / scalaBinaryVersion).value)
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28")