Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable scala 3 for cats and fs2 backends #871

Merged
merged 1 commit into from
Feb 23, 2021
Merged

Enable scala 3 for cats and fs2 backends #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ val catsEffectVersion: Option[(Long, Long)] => String = {
}
val fs2Version: Option[(Long, Long)] => String = {
case Some((2, 11)) => "2.1.0"
case _ => "2.5.2"
case _ => "2.5.3"
}

val akkaHttp = "com.typesafe.akka" %% "akka-http" % "10.2.3"
Expand Down Expand Up @@ -288,7 +288,7 @@ lazy val cats = (projectMatrix in file("effects/cats"))
)
.dependsOn(core % compileAndTest)
.jvmPlatform(
scalaVersions = scala2,
scalaVersions = scala2 ++ scala3,
settings = commonJvmSettings
)
.jsPlatform(
Expand All @@ -307,7 +307,7 @@ lazy val fs2 = (projectMatrix in file("effects/fs2"))
)
.dependsOn(core % compileAndTest, cats % compileAndTest)
.jvmPlatform(
scalaVersions = scala2,
scalaVersions = scala2 ++ scala3,
settings = commonJvmSettings
)
.jsPlatform(scalaVersions = List(scala2_12, scala2_13), settings = commonJsSettings)
Expand Down Expand Up @@ -433,11 +433,11 @@ lazy val asyncHttpClientMonixBackend =
.dependsOn(monix % compileAndTest)

lazy val asyncHttpClientCatsBackend =
asyncHttpClientBackendProject("cats")
asyncHttpClientBackendProject("cats", includeDotty = true)
.dependsOn(cats % compileAndTest)

lazy val asyncHttpClientFs2Backend =
asyncHttpClientBackendProject("fs2")
asyncHttpClientBackendProject("fs2", includeDotty = true)
.settings(
libraryDependencies ++= dependenciesFor(scalaVersion.value)(
"co.fs2" %% "fs2-reactive-streams" % fs2Version(_),
Expand Down Expand Up @@ -518,7 +518,7 @@ lazy val httpClientMonixBackend =
.dependsOn(monix % compileAndTest)

lazy val httpClientFs2Backend =
httpClientBackendProject("fs2")
httpClientBackendProject("fs2", includeDotty = true)
.settings(
libraryDependencies ++= dependenciesFor(scalaVersion.value)(
"co.fs2" %% "fs2-reactive-streams" % fs2Version(_),
Expand Down Expand Up @@ -577,7 +577,7 @@ lazy val armeriaMonixBackend =
.dependsOn(monix % compileAndTest)

lazy val armeriaFs2Backend =
armeriaBackendProject("fs2")
armeriaBackendProject("fs2", includeDotty = true)
.settings(
libraryDependencies ++= dependenciesFor(scalaVersion.value)(
"co.fs2" %% "fs2-reactive-streams" % fs2Version(_)
Expand All @@ -586,7 +586,7 @@ lazy val armeriaFs2Backend =
.dependsOn(fs2 % compileAndTest)

lazy val armeriaCatsBackend =
armeriaBackendProject("cats")
armeriaBackendProject("cats", includeDotty = true)
.dependsOn(cats % compileAndTest)

lazy val armeriaScalazBackend =
Expand Down
4 changes: 2 additions & 2 deletions effects/cats/src/test/scala/sttp/client3/impl/cats/CatsTestBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import scala.concurrent.duration.DurationInt
trait CatsTestBase {
implicit def executionContext: ExecutionContext

implicit lazy val monad: MonadError[IO] = new CatsMonadAsyncError[IO]
implicit val monad: MonadError[IO] = new CatsMonadAsyncError[IO]
implicit val contextShift: ContextShift[IO] = IO.contextShift(implicitly)
implicit lazy val timer: Timer[IO] = IO.timer(scala.concurrent.ExecutionContext.global)
implicit val timer: Timer[IO] = IO.timer(scala.concurrent.ExecutionContext.global)
lazy val blocker: Blocker = Blocker.liftExecutionContext(implicitly)

implicit val convertToFuture: ConvertToFuture[IO] = convertCatsIOToFuture
Expand Down