diff --git a/build.sbt b/build.sbt index c77f27eb81..4b42830477 100644 --- a/build.sbt +++ b/build.sbt @@ -162,12 +162,12 @@ lazy val cats: ProjectMatrix = (projectMatrix in file("integrations/cats")) .settings( name := "tapir-cats", libraryDependencies ++= Seq( - "org.typelevel" %% "cats-core" % "2.1.1", + "org.typelevel" %% "cats-core" % "2.2.0", scalaTest % Test, scalaCheck % Test, scalaTestPlusScalaCheck % Test, "org.typelevel" %% "discipline-scalatest" % "2.0.1" % Test, - "org.typelevel" %% "cats-laws" % "2.1.1" % Test + "org.typelevel" %% "cats-laws" % "2.2.0" % Test ) ) .jvmPlatform(scalaVersions = allScalaVersions) diff --git a/client/sttp-client/src/test/scala/sttp/tapir/client/sttp/SttpClientTests.scala b/client/sttp-client/src/test/scala/sttp/tapir/client/sttp/SttpClientTests.scala index a17ae3ef6a..a260660f57 100644 --- a/client/sttp-client/src/test/scala/sttp/tapir/client/sttp/SttpClientTests.scala +++ b/client/sttp-client/src/test/scala/sttp/tapir/client/sttp/SttpClientTests.scala @@ -1,7 +1,6 @@ package sttp.tapir.client.sttp import cats.effect.{ContextShift, IO} -import cats.implicits._ import sttp.tapir.{DecodeResult, Endpoint} import sttp.tapir.client.tests.ClientTests import sttp.client._ diff --git a/examples/src/main/scala/sttp/tapir/examples/HelloWorldHttp4sServer.scala b/examples/src/main/scala/sttp/tapir/examples/HelloWorldHttp4sServer.scala index 634450550c..d2a6414867 100644 --- a/examples/src/main/scala/sttp/tapir/examples/HelloWorldHttp4sServer.scala +++ b/examples/src/main/scala/sttp/tapir/examples/HelloWorldHttp4sServer.scala @@ -8,7 +8,7 @@ import org.http4s.server.blaze.BlazeServerBuilder import org.http4s.syntax.kleisli._ import sttp.tapir._ import sttp.tapir.server.http4s._ -import cats.implicits._ +import cats.syntax.all._ import scala.concurrent.ExecutionContext diff --git a/examples/src/main/scala/sttp/tapir/examples/MultipleEndpointsDocumentationHttp4sServer.scala b/examples/src/main/scala/sttp/tapir/examples/MultipleEndpointsDocumentationHttp4sServer.scala index c5a44b10aa..7e84fcb05e 100644 --- a/examples/src/main/scala/sttp/tapir/examples/MultipleEndpointsDocumentationHttp4sServer.scala +++ b/examples/src/main/scala/sttp/tapir/examples/MultipleEndpointsDocumentationHttp4sServer.scala @@ -3,7 +3,7 @@ package sttp.tapir.examples import java.util.concurrent.atomic.AtomicReference import cats.effect._ -import cats.implicits._ +import cats.syntax.all._ import com.github.ghik.silencer.silent import io.circe.generic.auto._ import org.http4s.HttpRoutes diff --git a/examples/src/main/scala/sttp/tapir/examples/StreamingHttp4sFs2Server.scala b/examples/src/main/scala/sttp/tapir/examples/StreamingHttp4sFs2Server.scala index 4c4897b49a..4de4925843 100644 --- a/examples/src/main/scala/sttp/tapir/examples/StreamingHttp4sFs2Server.scala +++ b/examples/src/main/scala/sttp/tapir/examples/StreamingHttp4sFs2Server.scala @@ -3,7 +3,7 @@ package sttp.tapir.examples import java.nio.charset.StandardCharsets import cats.effect._ -import cats.implicits._ +import cats.syntax.all._ import org.http4s.HttpRoutes import org.http4s.server.Router import org.http4s.server.blaze.BlazeServerBuilder diff --git a/examples/src/main/scala/sttp/tapir/examples/ZioExampleHttp4sServer.scala b/examples/src/main/scala/sttp/tapir/examples/ZioExampleHttp4sServer.scala index 4bd8bb96d3..e9c1206fba 100644 --- a/examples/src/main/scala/sttp/tapir/examples/ZioExampleHttp4sServer.scala +++ b/examples/src/main/scala/sttp/tapir/examples/ZioExampleHttp4sServer.scala @@ -10,7 +10,7 @@ import zio.{Has, IO, Runtime, Task, UIO, ZIO, ZLayer, ZEnv} import sttp.tapir.ztapir._ import sttp.tapir.server.http4s.ztapir._ import sttp.tapir.swagger.http4s.SwaggerHttp4s -import cats.implicits._ +import cats.syntax.all._ import UserLayer.UserService import sttp.tapir.examples.ZioExampleHttp4sServer.Pet import zio.console.Console diff --git a/server/akka-http-server/src/test/scala/sttp/tapir/server/akkahttp/AkkaHttpServerTests.scala b/server/akka-http-server/src/test/scala/sttp/tapir/server/akkahttp/AkkaHttpServerTests.scala index bb1c06ddd9..13fabbd63e 100644 --- a/server/akka-http-server/src/test/scala/sttp/tapir/server/akkahttp/AkkaHttpServerTests.scala +++ b/server/akka-http-server/src/test/scala/sttp/tapir/server/akkahttp/AkkaHttpServerTests.scala @@ -1,6 +1,6 @@ package sttp.tapir.server.akkahttp -import cats.implicits._ +import cats.syntax.all._ import akka.actor.ActorSystem import akka.http.scaladsl.Http import akka.http.scaladsl.server.Route diff --git a/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/EndpointToHttp4sServer.scala b/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/EndpointToHttp4sServer.scala index 08fa8f1444..f5d8648ef9 100644 --- a/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/EndpointToHttp4sServer.scala +++ b/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/EndpointToHttp4sServer.scala @@ -3,7 +3,7 @@ package sttp.tapir.server.http4s import cats.~> import cats.data._ import cats.effect.{ContextShift, Sync} -import cats.implicits._ +import cats.syntax.all._ import org.http4s.{EntityBody, HttpRoutes, Http, Request, Response} import org.log4s._ import sttp.tapir.monad.MonadError diff --git a/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/Http4sRequestToRawBody.scala b/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/Http4sRequestToRawBody.scala index abd0b87bd9..935a008f55 100644 --- a/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/Http4sRequestToRawBody.scala +++ b/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/Http4sRequestToRawBody.scala @@ -3,7 +3,7 @@ package sttp.tapir.server.http4s import java.io.ByteArrayInputStream import cats.effect.{Blocker, ContextShift, Sync} -import cats.implicits._ +import cats.syntax.all._ import fs2.Chunk import org.http4s.headers.{`Content-Disposition`, `Content-Type`} import org.http4s.{Charset, EntityDecoder, Request, multipart} diff --git a/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/OutputToHttp4sResponse.scala b/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/OutputToHttp4sResponse.scala index a6d9bc36d5..856a16fae7 100644 --- a/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/OutputToHttp4sResponse.scala +++ b/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/OutputToHttp4sResponse.scala @@ -3,7 +3,7 @@ package sttp.tapir.server.http4s import java.nio.charset.StandardCharsets import cats.effect.{Blocker, ContextShift, Sync} -import cats.implicits._ +import cats.syntax.all._ import fs2.Chunk import org.http4s import org.http4s.headers.{`Content-Disposition`, `Content-Type`} diff --git a/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/TapirHttp4sServer.scala b/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/TapirHttp4sServer.scala index 16c3953fc1..039d85038d 100644 --- a/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/TapirHttp4sServer.scala +++ b/server/http4s-server/src/main/scala/sttp/tapir/server/http4s/TapirHttp4sServer.scala @@ -3,7 +3,7 @@ package sttp.tapir.server.http4s import cats.{Monad, ~>} import cats.data.OptionT import cats.effect.{ContextShift, Sync} -import cats.implicits._ +import cats.syntax.all._ import org.http4s.{EntityBody, HttpRoutes, Http} import sttp.tapir.Endpoint import sttp.tapir.Endpoint diff --git a/server/http4s-server/src/test/scala/sttp/tapir/server/http4s/Http4sServerTests.scala b/server/http4s-server/src/test/scala/sttp/tapir/server/http4s/Http4sServerTests.scala index 5041f893da..0db943250d 100644 --- a/server/http4s-server/src/test/scala/sttp/tapir/server/http4s/Http4sServerTests.scala +++ b/server/http4s-server/src/test/scala/sttp/tapir/server/http4s/Http4sServerTests.scala @@ -2,7 +2,7 @@ package sttp.tapir.server.http4s import cats.data.{Kleisli, NonEmptyList} import cats.effect._ -import cats.implicits._ +import cats.syntax.all._ import org.http4s.server.Router import org.http4s.server.blaze.BlazeServerBuilder import org.http4s.syntax.kleisli._ diff --git a/server/vertx/src/test/scala/sttp/tapir/server/vertx/VertxServerTests.scala b/server/vertx/src/test/scala/sttp/tapir/server/vertx/VertxServerTests.scala index 2ec607e3a5..cafbb21df0 100644 --- a/server/vertx/src/test/scala/sttp/tapir/server/vertx/VertxServerTests.scala +++ b/server/vertx/src/test/scala/sttp/tapir/server/vertx/VertxServerTests.scala @@ -2,7 +2,7 @@ package sttp.tapir.server.vertx import cats.data.NonEmptyList import cats.effect.{IO, Resource} -import cats.implicits._ +import cats.syntax.all._ import io.vertx.lang.scala.VertxExecutionContext import io.vertx.scala.core.Vertx import io.vertx.scala.core.http.HttpServerOptions