Merge pull request #18 from tkrs/update-deps

chore(deps): update dependencies and plugins
tkrs · Jan 21, 2020 · 0f6c3fd · 0f6c3fd
2 parents ca79910 + bdfd6ba
commit 0f6c3fd
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 26 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version=2.3.1
+version=2.3.2
 align = most
 maxColumn = 120
 continuationIndent.defnSite = 2

diff --git a/cats-effect/src/test/scala/agni/catsEffect/AsyncSpec.scala b/cats-effect/src/test/scala/agni/catsEffect/AsyncSpec.scala
@@ -6,12 +6,12 @@ import java.util.function.Supplier
 
 import agni.util.Par
 import cats.effect.{ContextShift, IO}
-import org.scalatest._
+import org.scalatest.flatspec.AnyFlatSpec
 
 import scala.concurrent.duration._
 import scala.concurrent.ExecutionContext
 
-class AsyncSpec extends FlatSpec {
+class AsyncSpec extends AnyFlatSpec {
   import async._
 
   implicit def contextShift: ContextShift[IO] = IO.contextShift(ExecutionContext.global)

diff --git a/core/src/test/scala/agni/CodecSpec.scala b/core/src/test/scala/agni/CodecSpec.scala
@@ -11,9 +11,11 @@ import com.datastax.oss.driver.api.core.ProtocolVersion
 import com.datastax.oss.driver.api.core.data.CqlDuration
 import org.scalacheck.{Arbitrary, Gen, Prop, Shrink}
 import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.scalacheck.Checkers
 
-class CodecSpec extends FunSuite with Checkers with Matchers {
+class CodecSpec extends AnyFunSuite with Checkers with Matchers {
 
   implicit val arbString: Arbitrary[String] = Arbitrary(Gen.alphaStr)
   implicit val arbUUID: Arbitrary[UUID]     = Arbitrary(Gen.uuid)

diff --git a/core/src/test/scala/agni/DeserializerSpec.scala b/core/src/test/scala/agni/DeserializerSpec.scala
@@ -3,9 +3,11 @@ package agni
 import java.nio.ByteBuffer
 
 import com.datastax.oss.driver.api.core.ProtocolVersion
-import org.scalatest.{Assertion, FunSpec, Matchers}
+import org.scalatest.Assertion
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class DeserializerSpec extends FunSpec with Matchers {
+class DeserializerSpec extends AnyFunSpec with Matchers {
 
   val protoVer = ProtocolVersion.DEFAULT
 

diff --git a/core/src/test/scala/agni/SerializerSpec.scala b/core/src/test/scala/agni/SerializerSpec.scala
@@ -1,9 +1,10 @@
 package agni
 
 import com.datastax.oss.driver.api.core.ProtocolVersion
-import org.scalatest.{FunSpec, Matchers}
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class SerializerSpec extends FunSpec with Matchers {
+class SerializerSpec extends AnyFunSpec with Matchers {
 
   describe("contramap") {
 

diff --git a/core/src/test/scala/agni/TypedSuite.scala b/core/src/test/scala/agni/TypedSuite.scala
@@ -6,11 +6,11 @@ import java.time.{Instant, LocalDate}
 import java.util.UUID
 
 import com.datastax.oss.driver.api.core.data.{CqlDuration, TupleValue, UdtValue}
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 import org.scalatestplus.scalacheck.Checkers
 import shapeless.record._
 
-trait TypedSuite extends FunSuite with Checkers {
+trait TypedSuite extends AnyFunSuite with Checkers {
 
   // format: off
   type T1 = Option[Int]

diff --git a/core/src/test/scala/agni/std/AsyncSpec.scala b/core/src/test/scala/agni/std/AsyncSpec.scala
@@ -3,12 +3,12 @@ package agni.std
 import java.util.concurrent.{CompletableFuture, CompletionStage}
 
 import agni.util.Par
-import org.scalatest._
+import org.scalatest.flatspec.AnyFlatSpec
 
 import scala.concurrent.duration._
 import scala.concurrent.{Await, Future}
 
-class AsyncSpec extends FlatSpec {
+class AsyncSpec extends AnyFlatSpec {
   import async._
 
   val parF: Par.Aux[CompletionStage, Future] = implicitly

diff --git a/core/src/test/scala_2.13+/agni/CqlSpec.scala b/core/src/test/scala_2.13+/agni/CqlSpec.scala
@@ -4,8 +4,10 @@ import java.util.concurrent.CompletableFuture
 
 import com.datastax.oss.driver.api.core.CqlSession
 import com.datastax.oss.driver.api.core.cql.{AsyncResultSet, BoundStatement, Row}
-import org.scalatest._
 import org.mockito.Mockito._
+import org.scalatest._
+import org.scalatest.funspec.AsyncFunSpec
+import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.mockito.MockitoSugar
 
 import scala.annotation.tailrec

diff --git a/examples/src/main/scala/Main.scala b/examples/src/main/scala/Main.scala
@@ -8,7 +8,7 @@ import cats.implicits._
 import com.datastax.oss.driver.api.core.CqlSession
 import com.datastax.oss.driver.api.core.cql.PreparedStatement
 import com.datastax.oss.driver.api.querybuilder.{QueryBuilder => Q}
-import org.scalatest.Matchers
+import org.scalatest.matchers.should.Matchers
 
 object Main extends IOApp with Matchers {
   import Query._

diff --git a/monix/src/test/scala/agni/monix/AsyncSpec.scala b/monix/src/test/scala/agni/monix/AsyncSpec.scala
@@ -7,11 +7,11 @@ import java.util.function.Supplier
 import agni.util.Par
 import monix.eval.Task
 import monix.execution.Scheduler
-import org.scalatest._
+import org.scalatest.flatspec.AnyFlatSpec
 
 import scala.concurrent.duration._
 
-class AsyncSpec extends FlatSpec {
+class AsyncSpec extends AnyFlatSpec {
   import async._
   import Scheduler.Implicits.global
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -10,13 +10,16 @@ object Dependencies {
     val datastax   = "4.3.0"
     val cats       = "2.0.0"
     val shapeless  = "2.3.3"
-    val scalacheck = "1.14.1"
-    val scalatest  = "3.0.8"
     val catbird    = "19.9.0"
     val monix      = "3.1.0"
     val catsEffect = "2.0.0"
-    val mockito    = "3.1.0"
     val slf4j      = "1.7.13"
+
+    val scalatest = "3.1.0"
+    val scalatestplus = new {
+      val scalacheck = "3.1.0.1"
+      val mockito    = "3.1.0.0"
+    }
   }
 
   val P = new {
@@ -30,9 +33,10 @@ object Dependencies {
     val monixEval            = "io.monix"         %% "monix-eval"               % V.monix
     val monixTail            = "io.monix"         %% "monix-tail"               % V.monix
     val catsEffect           = "org.typelevel"    %% "cats-effect"              % V.catsEffect
-    val scalacheck           = "org.scalacheck"   %% "scalacheck"               % V.scalacheck
-    val scalatest            = "org.scalatest"    %% "scalatest"                % V.scalatest
-    val mockito              = "org.mockito"      % "mockito-core"              % V.mockito
     val slf4jSimple          = "org.slf4j"        % "slf4j-simple"              % V.slf4j
+
+    lazy val scalatest  = "org.scalatest"     %% "scalatest"       % V.scalatest
+    lazy val scalacheck = "org.scalatestplus" %% "scalacheck-1-14" % V.scalatestplus.scalacheck
+    lazy val mockito    = "org.scalatestplus" %% "mockito-3-2"     % V.scalatestplus.mockito
   }
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
+addSbtPlugin("pl.project13.scala" % "sbt-jmh"       % "0.3.7")
 addSbtPlugin("org.scalameta"      % "sbt-scalafmt"  % "2.3.0")
 addSbtPlugin("org.scoverage"      % "sbt-scoverage" % "1.6.1")
 addSbtPlugin("org.xerial.sbt"     % "sbt-sonatype"  % "3.8.1")
+addSbtPlugin("com.github.gseitz"  % "sbt-release"   % "1.0.13")
 addSbtPlugin("com.jsuereth"       % "sbt-pgp"       % "2.0.1")
-addSbtPlugin("com.github.gseitz"  % "sbt-release"   % "1.0.12")
-addSbtPlugin("pl.project13.scala" % "sbt-jmh"       % "0.3.7")
diff --git a/twitter-util/src/test/scala/agni/twitterUtil/AsyncSpec.scala b/twitter-util/src/test/scala/agni/twitterUtil/AsyncSpec.scala
@@ -5,11 +5,11 @@ import java.util.function.Supplier
 
 import agni.util.Par
 import com.twitter.util.{Await, Future}
-import org.scalatest._
+import org.scalatest.flatspec.AnyFlatSpec
 
 import scala.concurrent.duration._
 
-class AsyncSpec extends FlatSpec {
+class AsyncSpec extends AnyFlatSpec {
   import async._
 
   val parF: Par.Aux[CompletionStage, Future] = implicitly