From 0075e1fb81073a4f8d67ebc2680a69812dc14ee2 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 11 Sep 2024 00:17:35 +0200 Subject: [PATCH 1/4] Update http4s-ember-server to 0.23.28 (#2395) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index edb04bd15..0fb3a4e38 100644 --- a/build.sbt +++ b/build.sbt @@ -12,7 +12,7 @@ val catsEffect3Version = "3.5.4" val catsMtlVersion = "1.3.0" val circeVersion = "0.14.10" val fs2Version = "3.11.0" -val http4sVersion = "0.23.27" +val http4sVersion = "0.23.28" val javaTimeVersion = "2.5.0" val jsoniterVersion = "2.30.9" val laminextVersion = "0.17.0" From 73bc9ed67dee31ca8a8a9be6f4ba3401df868297 Mon Sep 17 00:00:00 2001 From: kyri-petrou <67301607+kyri-petrou@users.noreply.github.com> Date: Thu, 12 Sep 2024 01:25:37 +0300 Subject: [PATCH 2/4] Update ZIO Http (#2383) --- .../src/main/scala/caliban/QuickAdapter.scala | 9 --------- .../main/scala/caliban/QuickRequestHandler.scala | 4 +++- .../src/main/scala/caliban/quick/package.scala | 16 ---------------- build.sbt | 7 +++++-- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/adapters/quick/src/main/scala/caliban/QuickAdapter.scala b/adapters/quick/src/main/scala/caliban/QuickAdapter.scala index e9fe65b97..71f2d2b1f 100644 --- a/adapters/quick/src/main/scala/caliban/QuickAdapter.scala +++ b/adapters/quick/src/main/scala/caliban/QuickAdapter.scala @@ -54,15 +54,6 @@ final class QuickAdapter[R] private (requestHandler: QuickRequestHandler[R]) { Routes.fromIterable(apiRoutes ::: graphiqlRoute ::: uploadRoute ::: wsRoute) } - @deprecated("Use `routes` instead", "2.6.1") - def toApp( - apiPath: String, - graphiqlPath: Option[String] = None, - uploadPath: Option[String] = None, - webSocketPath: Option[String] = None - ): HttpApp[R] = - HttpApp(routes(apiPath, graphiqlPath, uploadPath, webSocketPath)) - /** * Runs the server using the default zio-http server configuration on the specified port. * This is meant as a convenience method for getting started quickly diff --git a/adapters/quick/src/main/scala/caliban/QuickRequestHandler.scala b/adapters/quick/src/main/scala/caliban/QuickRequestHandler.scala index ebfb1544c..43f5f6d22 100644 --- a/adapters/quick/src/main/scala/caliban/QuickRequestHandler.scala +++ b/adapters/quick/src/main/scala/caliban/QuickRequestHandler.scala @@ -236,7 +236,9 @@ final private class QuickRequestHandler[R]( .mapConcatChunk(Chunk.fromArray) } - private def encodeTextEventStream(resp: GraphQLResponse[Any])(implicit trace: Trace): UStream[ServerSentEvent] = + private def encodeTextEventStream( + resp: GraphQLResponse[Any] + )(implicit trace: Trace): UStream[ServerSentEvent[String]] = ServerSentEvents.transformResponse( resp, v => ServerSentEvent(writeToString(v), Some("next")), diff --git a/adapters/quick/src/main/scala/caliban/quick/package.scala b/adapters/quick/src/main/scala/caliban/quick/package.scala index ae23709fc..ec799b63b 100644 --- a/adapters/quick/src/main/scala/caliban/quick/package.scala +++ b/adapters/quick/src/main/scala/caliban/quick/package.scala @@ -62,22 +62,6 @@ package object quick { ) ) - @deprecated("use `routes` instead", "2.6.1") - def toApp( - apiPath: String, - graphiqlPath: Option[String] = None, - uploadPath: Option[String] = None, - webSocketPath: Option[String] = None - )(implicit trace: Trace): IO[CalibanError.ValidationError, HttpApp[R]] = - gql.interpreter.map( - QuickAdapter(_).toApp( - apiPath = apiPath, - graphiqlPath = graphiqlPath, - uploadPath = uploadPath, - webSocketPath = webSocketPath - ) - ) - /** * Creates a zio-http handler for the GraphQL API * diff --git a/build.sbt b/build.sbt index 0fb3a4e38..0c69fbbe6 100644 --- a/build.sbt +++ b/build.sbt @@ -31,7 +31,7 @@ val zioInteropReactiveVersion = "2.0.2" val zioConfigVersion = "4.0.2" val zqueryVersion = "0.7.5" val zioJsonVersion = "0.7.3" -val zioHttpVersion = "3.0.0-RC9" +val zioHttpVersion = "3.0.0" val zioOpenTelemetryVersion = "3.0.0-RC21" Global / onChangedBuildSource := ReloadOnSourceChanges @@ -746,7 +746,10 @@ lazy val enableMimaSettingsJVM = Def.settings( mimaFailOnProblem := enforceMimaCompatibility, mimaPreviousArtifacts := previousStableVersion.value.map(organization.value %% moduleName.value % _).toSet, - mimaBinaryIssueFilters := Seq() + mimaBinaryIssueFilters := Seq( + ProblemFilters.exclude[DirectMissingMethodProblem]("caliban.quick.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("caliban.QuickAdapter.*") + ) ) lazy val enableMimaSettingsJS = From 131a876fe9a14a6998a0efae2d520764186843ae Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 13 Sep 2024 00:29:33 +0200 Subject: [PATCH 3/4] Update opentelemetry-sdk-testing to 1.42.1 (#2399) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 0c69fbbe6..67e2a9566 100644 --- a/build.sbt +++ b/build.sbt @@ -236,7 +236,7 @@ lazy val tracing = project "dev.zio" %% "zio-opentelemetry" % zioOpenTelemetryVersion, "dev.zio" %% "zio-test" % zioVersion % Test, "dev.zio" %% "zio-test-sbt" % zioVersion % Test, - "io.opentelemetry" % "opentelemetry-sdk-testing" % "1.42.0" % Test + "io.opentelemetry" % "opentelemetry-sdk-testing" % "1.42.1" % Test ) ) .dependsOn(core, tools) From e3ec8dd3b43fc2037214bc2d2d7da8d01e4ff065 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 13 Sep 2024 00:29:42 +0200 Subject: [PATCH 4/4] Update interface to 1.0.20 (#2398) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 67e2a9566..8e39d55c2 100644 --- a/build.sbt +++ b/build.sbt @@ -211,7 +211,7 @@ lazy val tools = project .settings( libraryDependencies ++= Seq( "org.scalameta" % "scalafmt-interfaces" % scalafmtVersion, - "io.get-coursier" % "interface" % "1.0.19", + "io.get-coursier" % "interface" % "1.0.20", "com.softwaremill.sttp.client3" %% "zio" % sttpVersion, "dev.zio" %% "zio-test" % zioVersion % Test, "dev.zio" %% "zio-test-sbt" % zioVersion % Test,