Merge pull request #51 from christiankjaer/cats-2.1.0

Updated cats and scalatest versions
RMSone · Feb 18, 2020 · 9e7434b · 9e7434b
2 parents d035fe0 + 04c4270
commit 9e7434b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -41,6 +41,7 @@ Because of possible binary incompatibilities here are the dependency versions us
 |         0.9.0      |     3.2.3     |     1.5.x     |
 |         0.9.1      |     3.3.0     |     1.5.x     |
 |         0.10.1      |     3.3.2     |     2.0.0     |
+|         0.10.2      |     3.3.2     |     2.1.0     |
 
 Artifacts are publicly available on Maven Central starting from version *0.6*.
 

diff --git a/build.sbt b/build.sbt
@@ -7,7 +7,7 @@ val commonSettings = Seq(
   organization := "com.rms.miu",
 
   scalaVersion := "2.12.10",
-  crossScalaVersions := Seq("2.11.12", "2.12.10","2.13.1"),
+  crossScalaVersions := Seq("2.12.10","2.13.1"),
 
   scalacOptions ++= Seq(
     "-deprecation",
@@ -24,7 +24,7 @@ val commonSettings = Seq(
   )
 )
 
-val catsVersion = "2.0.0"
+val catsVersion = "2.1.0"
 
 lazy val slickcats =
   project.in(file("slick-cats"))
@@ -36,9 +36,9 @@ lazy val slickcats =
         "com.typesafe.slick" %% "slick" % "3.3.2",
         "org.typelevel" %% "cats-core" % catsVersion,
         "org.typelevel" %% "cats-laws" % catsVersion % Test,
-        "org.typelevel" %% "discipline-scalatest" % "1.0.0-RC1" % Test,
-        "org.scalatest" %% "scalatest" % "3.0.8" % Test,
-        "org.scalacheck" %% "scalacheck" % "1.14.2" % Test
+        "org.typelevel" %% "discipline-scalatest" % "1.0.0" % Test,
+        "org.scalatest" %% "scalatest" % "3.1.0" % Test,
+        "org.scalacheck" %% "scalacheck" % "1.14.3" % Test
       )
     )
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.3
+sbt.version=1.3.8
diff --git a/slick-cats/project/build.properties b/slick-cats/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.3.8
diff --git a/slick-cats/src/test/scala/com/rms/miu/slickcats/DBIOInstancesTest.scala b/slick-cats/src/test/scala/com/rms/miu/slickcats/DBIOInstancesTest.scala
@@ -18,18 +18,20 @@ import org.scalacheck.Arbitrary.arbitrary
 import org.scalacheck.{Arbitrary, Cogen, Gen}
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
-import org.typelevel.discipline.scalatest.Discipline
+import org.scalatestplus.scalacheck.Checkers
+import org.typelevel.discipline.scalatest.FunSuiteDiscipline
 import slick.dbio.DBIO
 
 import scala.concurrent.Await
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._
 import scala.util.{Failure, Success}
 
-class DBIOInstancesTest extends AnyFunSuite with Matchers with Discipline with AllInstances with DBIOInstances {
+class DBIOInstancesTest extends AnyFunSuite with Matchers with FunSuiteDiscipline with Checkers with AllInstances with DBIOInstances {
   private val timeout = 3.seconds
   private val db = slick.memory.MemoryProfile.backend.Database(global)
 
+
   def dbioEither[A](f: DBIO[A]): DBIO[Either[Throwable, A]] =
     f.map(Right[Throwable, A]).asTry.map {
       case Success(x) => x

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.10.1"
+version in ThisBuild := "0.10.2"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version in ThisBuild := "0.10.1"
		version in ThisBuild := "0.10.2"