Update dependencies and migrate to Doobie 8.4

scalalandio · Oct 2, 2019 · 3de327e · 3de327e
1 parent 113f939
commit 3de327e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 17 deletions.
diff --git a/modules/core/src/test/scala/io/scalaland/ocdquery/WithH2Database.scala b/modules/core/src/test/scala/io/scalaland/ocdquery/WithH2Database.scala
@@ -23,7 +23,7 @@ trait WithH2Database extends BeforeAfterAll with IOChecker { this: Specification
         "sa", // username
         "", // password
         ce, // await connection here
-        te // execute JDBC operations here
+        Blocker.liftExecutionContext(te) // execute JDBC operations here
       )
     } yield xa).allocated.unsafeRunSync()
 

diff --git a/modules/tests/src/it/scala/io/scalaland/ocdquery/H2Functionality.scala b/modules/tests/src/it/scala/io/scalaland/ocdquery/H2Functionality.scala
@@ -1,6 +1,6 @@
 package io.scalaland.ocdquery
 
-import cats.effect.{ IO, Resource }
+import cats.effect.{ Blocker, IO, Resource }
 import doobie._
 import doobie.implicits._
 import doobie.h2.H2Transactor
@@ -13,11 +13,11 @@ final class H2Functionality extends Specification with TestCommonFeatures {
       ce <- ExecutionContexts.fixedThreadPool[IO](32) // scalastyle:ignore
       te <- ExecutionContexts.cachedThreadPool[IO]
       xa <- H2Transactor.newH2Transactor[IO](
-        url        = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1",
-        user       = "ocdquery",
-        pass       = "password",
-        connectEC  = ce,
-        transactEC = te
+        url       = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1",
+        user      = "ocdquery",
+        pass      = "password",
+        connectEC = ce,
+        blocker   = Blocker.liftExecutionContext(te)
       )
     } yield xa
 

diff --git a/modules/tests/src/it/scala/io/scalaland/ocdquery/MySQLFunctionality.scala b/modules/tests/src/it/scala/io/scalaland/ocdquery/MySQLFunctionality.scala
@@ -1,6 +1,6 @@
 package io.scalaland.ocdquery
 
-import cats.effect.{ IO, Resource }
+import cats.effect.{ Blocker, IO, Resource }
 import doobie._
 import doobie.implicits._
 import doobie.hikari.HikariTransactor
@@ -20,7 +20,7 @@ final class MySQLFunctionality extends Specification with TestCommonFeatures {
         user            = "ocdquery",
         pass            = "password",
         connectEC       = ce,
-        transactEC      = te
+        blocker         = Blocker.liftExecutionContext(te)
       )
     } yield xa
 

diff --git a/modules/tests/src/it/scala/io/scalaland/ocdquery/PostgresFunctionality.scala b/modules/tests/src/it/scala/io/scalaland/ocdquery/PostgresFunctionality.scala
@@ -1,6 +1,6 @@
 package io.scalaland.ocdquery
 
-import cats.effect.{ IO, Resource }
+import cats.effect.{ Blocker, IO, Resource }
 import doobie._
 import doobie.implicits._
 import doobie.hikari.HikariTransactor
@@ -18,7 +18,7 @@ final class PostgresFunctionality extends Specification with TestCommonFeatures
         user            = "ocdquery",
         pass            = "password",
         connectEC       = ce,
-        transactEC      = te
+        blocker         = Blocker.liftExecutionContext(te)
       )
     } yield xa
 

diff --git a/ocdquery.sbt b/ocdquery.sbt
@@ -47,4 +47,3 @@ lazy val readme = scalatex.ScalatexReadme(
 
 addCommandAlias("fullTest", ";test;it:test;scalastyle")
 addCommandAlias("fullCoverageTest", ";coverage;test;it:test;coverageReport;coverageAggregate;scalastyle")
-addCommandAlias("relock", ";unlock;reload;update;lock")
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,14 +6,14 @@ object Dependencies {
 
   // scala version
   val scalaOrganization = "org.scala-lang"
-  val scalaVersion      = "2.12.9"
+  val scalaVersion      = "2.12.10"
 
   // build tools version
   val scalaFmtVersion = "1.5.1"
 
   // libraries versions
-  val doobieVersion   = "0.7.0"
-  val specs2Version   = "4.5.1"
+  val doobieVersion   = "0.8.4"
+  val specs2Version   = "4.7.1"
 
   // resolvers
   val resolvers = Seq(
@@ -27,7 +27,7 @@ object Dependencies {
   val doobieHikari       = "org.tpolecat"                 %% "doobie-hikari"             % doobieVersion
   val doobiePostgres     = "org.tpolecat"                 %% "doobie-postgres"           % doobieVersion
   val doobieSpecs2       = "org.tpolecat"                 %% "doobie-specs2"             % doobieVersion
-  val magnolia           = "com.propensive"               %% "magnolia"                  % "0.11.0"
+  val magnolia           = "com.propensive"               %% "magnolia"                  % "0.12.0"
   val shapeless          = "com.chuusai"                  %% "shapeless"                 % "2.3.3"
   val quicklens          = "com.softwaremill.quicklens"   %% "quicklens"                 % "1.4.12"
   // db

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.0-RC3
+sbt.version=1.3.0