From 1228428b2e3c637461fec85e859c2f34125cc48f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Fri, 22 Oct 2021 04:07:59 +0200 Subject: [PATCH 1/4] Remove blaze dependency from http4s module --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index c99e8537cd..51075a44da 100644 --- a/build.sbt +++ b/build.sbt @@ -254,7 +254,6 @@ lazy val http4s = project "org.typelevel" %% "cats-effect" % catsEffect3Version, "org.http4s" %% "http4s-dsl" % http4sVersion, "org.http4s" %% "http4s-circe" % http4sVersion, - "org.http4s" %% "http4s-blaze-server" % http4sVersion, "io.circe" %% "circe-parser" % circeVersion, "dev.zio" %% "zio-test" % zioVersion % Test, "dev.zio" %% "zio-test-sbt" % zioVersion % Test, @@ -400,6 +399,7 @@ lazy val examples = project crossScalaVersions -= scala3, libraryDependencies ++= Seq( "de.heikoseeberger" %% "akka-http-circe" % "1.38.2", + "org.http4s" %% "http4s-blaze-server" % http4sVersion, "com.softwaremill.sttp.client3" %% "async-http-client-backend-zio" % sttpVersion, "com.softwaremill.sttp.tapir" %% "tapir-json-circe" % tapirVersion, "io.circe" %% "circe-generic" % circeVersion, From 6be40f4cb78db935f5b546ab43dea2f27863f3cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Fri, 22 Oct 2021 04:11:04 +0200 Subject: [PATCH 2/4] Add http4s-server --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 51075a44da..14ad7aba9e 100644 --- a/build.sbt +++ b/build.sbt @@ -253,6 +253,7 @@ lazy val http4s = project "dev.zio" %% "zio-interop-cats" % zioInteropCats3Version, "org.typelevel" %% "cats-effect" % catsEffect3Version, "org.http4s" %% "http4s-dsl" % http4sVersion, + "org.http4s" %% "http4s-server" % http4sVersion, "org.http4s" %% "http4s-circe" % http4sVersion, "io.circe" %% "circe-parser" % circeVersion, "dev.zio" %% "zio-test" % zioVersion % Test, From 31b9e053404343b4851fa6cd0abba0b2dec54dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Fri, 22 Oct 2021 04:43:03 +0200 Subject: [PATCH 3/4] empty commit From db7c4d69b3c80b807db107ead45c11dd2a5a7cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Fri, 22 Oct 2021 04:50:07 +0200 Subject: [PATCH 4/4] Add blaze back for tests --- build.sbt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 14ad7aba9e..9c5c0a47b7 100644 --- a/build.sbt +++ b/build.sbt @@ -256,11 +256,12 @@ lazy val http4s = project "org.http4s" %% "http4s-server" % http4sVersion, "org.http4s" %% "http4s-circe" % http4sVersion, "io.circe" %% "circe-parser" % circeVersion, - "dev.zio" %% "zio-test" % zioVersion % Test, - "dev.zio" %% "zio-test-sbt" % zioVersion % Test, - "com.softwaremill.sttp.client3" %% "async-http-client-backend-zio" % sttpVersion % Test, - "com.softwaremill.sttp.client3" %% "circe" % sttpVersion % Test, - "io.circe" %% "circe-generic" % circeVersion % Test + "org.http4s" %% "http4s-blaze-server" % http4sVersion % Test, + "dev.zio" %% "zio-test" % zioVersion % Test, + "dev.zio" %% "zio-test-sbt" % zioVersion % Test, + "com.softwaremill.sttp.client3" %% "async-http-client-backend-zio" % sttpVersion % Test, + "com.softwaremill.sttp.client3" %% "circe" % sttpVersion % Test, + "io.circe" %% "circe-generic" % circeVersion % Test ) ) .dependsOn(core, catsInterop)