From 04c427098774be0f92bc5e16dfd02903b11b8e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Kj=C3=A6r=20Larsen?= Date: Mon, 10 Feb 2020 11:04:47 +0100 Subject: [PATCH] Updated cats and scalatest versions --- README.md | 1 + build.sbt | 10 +++++----- project/build.properties | 2 +- slick-cats/project/build.properties | 1 + .../com/rms/miu/slickcats/DBIOInstancesTest.scala | 6 ++++-- version.sbt | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 slick-cats/project/build.properties diff --git a/README.md b/README.md index 6ede8d1..7c9fd1b 100644 --- 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 index b1c4d78..f28e1b9 100644 --- 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 index 6adcdc7..a919a9b 100644 --- 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 new file mode 100644 index 0000000..a919a9b --- /dev/null +++ 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 index 0358ef6..8cf590b 100644 --- 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,7 +18,8 @@ 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 @@ -26,10 +27,11 @@ 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 index 8b0f7f5..0c3cb71 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.10.1" +version in ThisBuild := "0.10.2"