From 752d55dbf82fc48ed30d92e39d609284b8fc330a Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Sun, 19 Jun 2022 01:29:08 -0400 Subject: [PATCH 01/55] s/scalatags/servlet/ in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 36d57c5a..a69163de 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Runs http4s apps as Java servlets. Provides components for the [http4s-jetty][h ```scala libraryDependencies ++= Seq( - "org.http4s" %% "http4s-servlet" % http4sScalatagsV + "org.http4s" %% "http4s-servlet" % http4sServletV ) ``` From 3b32cc6e419bed79c7893de0c4c508bcd76cdebc Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 20:26:53 +0000 Subject: [PATCH 02/55] Update jetty-client, jetty-runner, ... to 9.4.47.v20220610 in series/0.23 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 7b2533ce..effb7013 100644 --- a/build.sbt +++ b/build.sbt @@ -25,7 +25,7 @@ ThisBuild / scalaVersion := Scala213 // the default Scala lazy val root = tlCrossRootProject.aggregate(servlet, examples) val asyncHttpClientVersion = "2.12.3" -val jettyVersion = "9.4.46.v20220331" +val jettyVersion = "9.4.47.v20220610" val http4sVersion = "0.23.12" val munitCatsEffectVersion = "1.0.7" val servletApiVersion = "3.1.0" From c2b4e7ad70ba856af7bf04216f8dd77e617c318d Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Mon, 20 Jun 2022 20:02:15 -0400 Subject: [PATCH 03/55] servlet-4-is-jetty-10 --- .scala-steward.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.scala-steward.conf b/.scala-steward.conf index 7e1dd56c..7c985468 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -1,9 +1,9 @@ updates.pin = [ # Servlet 4 debuts in series/0.24 { groupId = "javax.servlet", version = "3." }, - # Jetty > 9 is a breaking change - { groupId = "org.eclipse.jetty", version = "9." }, - { groupId = "org.eclipse.jetty.http2", version = "9." } + # Jetty > 10 is a breaking change + { groupId = "org.eclipse.jetty", version = "10." }, + { groupId = "org.eclipse.jetty.http2", version = "10." } ] updates.ignore = [ From 4bec4f27a3ed83902a53ea93ecf391579beacad7 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 16:49:37 +0000 Subject: [PATCH 04/55] Update scala3-library to 3.1.3 in series/0.23 --- .github/workflows/ci.yml | 6 +++--- build.sbt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b740fd1..693e6f78 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - scala: [2.12.16, 2.13.8, 3.1.2] + scala: [2.12.16, 2.13.8, 3.1.3] java: [temurin@8, temurin@11, temurin@17] project: [rootJVM] exclude: @@ -37,9 +37,9 @@ jobs: java: temurin@11 - scala: 2.12.16 java: temurin@17 - - scala: 3.1.2 + - scala: 3.1.3 java: temurin@11 - - scala: 3.1.2 + - scala: 3.1.3 java: temurin@17 runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index effb7013..48edc001 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ ThisBuild / developers := List( ThisBuild / tlSitePublishBranch := Some("main") val Scala213 = "2.13.8" -ThisBuild / crossScalaVersions := Seq("2.12.16", Scala213, "3.1.2") +ThisBuild / crossScalaVersions := Seq("2.12.16", Scala213, "3.1.3") ThisBuild / scalaVersion := Scala213 // the default Scala lazy val root = tlCrossRootProject.aggregate(servlet, examples) From ab5da7ec7f0bdae5bc03991f458e2a885e537dd4 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 16:50:03 +0000 Subject: [PATCH 05/55] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 693e6f78..2a082de1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -265,12 +265,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.1.2, rootJVM) + - name: Download target directories (3.1.3, rootJVM) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.3-rootJVM - - name: Inflate target directories (3.1.2, rootJVM) + - name: Inflate target directories (3.1.3, rootJVM) run: | tar xf targets.tar rm targets.tar From 03a479dc830b2a5e5d21ed27e7de233997273c8e Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Tue, 21 Jun 2022 14:14:17 -0400 Subject: [PATCH 06/55] Ignore scala3-library from http4s-steward --- .scala-steward.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.scala-steward.conf b/.scala-steward.conf index 7c985468..7c263d46 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -8,5 +8,6 @@ updates.pin = [ updates.ignore = [ # Inherit from series/0.23 - { groupId = "org.http4s", artifactId = "sbt-http4s-org" } + { groupId = "org.http4s", artifactId = "sbt-http4s-org" }, + { groupId = "org.scala-lang", artifactId = "scala3-library" } ] From b11f72273e4ae180372bf35588cafdd1d9c5424f Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 20:33:00 +0000 Subject: [PATCH 07/55] Update jetty-client, jetty-runner, ... to 10.0.10 in series/0.24 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8f37c794..fcaea3fc 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ ThisBuild / tlJdkRelease := Some(8) lazy val root = tlCrossRootProject.aggregate(servlet, examples) val asyncHttpClientVersion = "2.12.3" -val jettyVersion = "10.0.9" +val jettyVersion = "10.0.10" val http4sVersion = "0.23.12" val munitCatsEffectVersion = "1.0.7" val servletApiVersion = "4.0.1" From 6adc4c3272d5a6ffc15003c3bb54e8afaa9d70b7 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 16:36:00 +0000 Subject: [PATCH 08/55] Update jetty-client, jetty-runner, ... to 9.4.48.v20220622 in series/0.23 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 48edc001..f8b0f99a 100644 --- a/build.sbt +++ b/build.sbt @@ -25,7 +25,7 @@ ThisBuild / scalaVersion := Scala213 // the default Scala lazy val root = tlCrossRootProject.aggregate(servlet, examples) val asyncHttpClientVersion = "2.12.3" -val jettyVersion = "9.4.47.v20220610" +val jettyVersion = "9.4.48.v20220622" val http4sVersion = "0.23.12" val munitCatsEffectVersion = "1.0.7" val servletApiVersion = "3.1.0" From 7bca135f915834bbc6111f1995f821ea0755da1c Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 16:36:07 +0000 Subject: [PATCH 09/55] Update jetty-client, jetty-runner, ... to 10.0.11 in series/0.24 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index fcaea3fc..eed8ee5a 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ ThisBuild / tlJdkRelease := Some(8) lazy val root = tlCrossRootProject.aggregate(servlet, examples) val asyncHttpClientVersion = "2.12.3" -val jettyVersion = "10.0.10" +val jettyVersion = "10.0.11" val http4sVersion = "0.23.12" val munitCatsEffectVersion = "1.0.7" val servletApiVersion = "4.0.1" From 2f528db6d231f7469c4335fdafa3c7854f9c0100 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Fri, 24 Jun 2022 13:35:02 -0400 Subject: [PATCH 10/55] Add a builder for AsyncHttp4sServlet --- .../http4s/servlet/AsyncHttp4sServlet.scala | 65 +++++++++++++++---- .../servlet/syntax/ServletContextSyntax.scala | 12 ++-- .../servlet/AsyncHttp4sServletSuite.scala | 12 ++-- .../http4s/servlet/RouterInServletSuite.scala | 10 +-- 4 files changed, 66 insertions(+), 33 deletions(-) diff --git a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala index 63a301d7..b98e9d8c 100644 --- a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala +++ b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala @@ -28,14 +28,14 @@ import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse import scala.concurrent.duration.Duration -class AsyncHttp4sServlet[F[_]]( - service: HttpApp[F], - asyncTimeout: Duration = Duration.Inf, +class AsyncHttp4sServlet[F[_]] private[servlet] ( + httpApp: HttpApp[F], + asyncTimeout: Duration, servletIo: ServletIo[F], serviceErrorHandler: ServiceErrorHandler[F], dispatcher: Dispatcher[F], )(implicit F: Async[F]) - extends Http4sServlet[F](service, servletIo, dispatcher) { + extends Http4sServlet[F](httpApp, servletIo, dispatcher) { private val asyncTimeoutMillis = if (asyncTimeout.isFinite) asyncTimeout.toMillis else -1 // -1 == Inf @@ -131,16 +131,59 @@ class AsyncHttp4sServlet[F[_]]( } object AsyncHttp4sServlet { + + class Builder[F[_]] private[AsyncHttp4sServlet] ( + httpApp: HttpApp[F], + dispatcher: Dispatcher[F], + asyncTimeout: Option[Duration], + chunkSize: Option[Int], + ) { + private def copy( + httpApp: HttpApp[F] = httpApp, + dispatcher: Dispatcher[F] = dispatcher, + asyncTimeout: Option[Duration] = asyncTimeout, + chunkSize: Option[Int] = chunkSize, + ): Builder[F] = + new Builder[F]( + httpApp, + dispatcher, + asyncTimeout, + chunkSize, + ) {} + + def build(implicit F: Async[F]): AsyncHttp4sServlet[F] = + new AsyncHttp4sServlet( + httpApp, + asyncTimeout.getOrElse(Duration.Inf), + NonBlockingServletIo(chunkSize.getOrElse(DefaultChunkSize)), + DefaultServiceErrorHandler, + dispatcher, + ) + + def withHttpApp(httpApp: HttpApp[F]): Builder[F] = + copy(httpApp = httpApp) + + def withDispatcher(dispatcher: Dispatcher[F]): Builder[F] = + copy(dispatcher = dispatcher) + + def withAsyncTimeout(asyncTimeout: Duration): Builder[F] = + copy(asyncTimeout = Some(asyncTimeout)) + + def withChunkSize(chunkSize: Int): Builder[F] = + copy(chunkSize = Some(chunkSize)) + } + + def builder[F[_]](httpApp: HttpApp[F], dispatcher: Dispatcher[F]): Builder[F] = + new Builder[F](httpApp, dispatcher, None, None) {} + + @deprecated("Use `builder`. `service` is renamed to `httpApp`.", "0.22.13") def apply[F[_]: Async]( service: HttpApp[F], asyncTimeout: Duration = Duration.Inf, dispatcher: Dispatcher[F], ): AsyncHttp4sServlet[F] = - new AsyncHttp4sServlet[F]( - service, - asyncTimeout, - NonBlockingServletIo[F](DefaultChunkSize), - DefaultServiceErrorHandler, - dispatcher, - ) + AsyncHttp4sServlet + .builder[F](service, dispatcher) + .withAsyncTimeout(asyncTimeout) + .build } diff --git a/servlet/src/main/scala/org/http4s/servlet/syntax/ServletContextSyntax.scala b/servlet/src/main/scala/org/http4s/servlet/syntax/ServletContextSyntax.scala index 9d07ba3f..67b4dbc7 100644 --- a/servlet/src/main/scala/org/http4s/servlet/syntax/ServletContextSyntax.scala +++ b/servlet/src/main/scala/org/http4s/servlet/syntax/ServletContextSyntax.scala @@ -20,7 +20,6 @@ package syntax import cats.effect._ import cats.effect.std.Dispatcher -import org.http4s.server.DefaultServiceErrorHandler import org.http4s.server.defaults import org.http4s.syntax.all._ @@ -73,13 +72,10 @@ final class ServletContextOps private[syntax] (val self: ServletContext) extends dispatcher: Dispatcher[F], asyncTimeout: Duration = defaults.ResponseTimeout, ): ServletRegistration.Dynamic = { - val servlet = new AsyncHttp4sServlet( - service = service, - asyncTimeout = asyncTimeout, - servletIo = NonBlockingServletIo(DefaultChunkSize), - serviceErrorHandler = DefaultServiceErrorHandler[F], - dispatcher, - ) + val servlet = AsyncHttp4sServlet + .builder[F](service, dispatcher) + .withAsyncTimeout(asyncTimeout) + .build val reg = self.addServlet(name, servlet) reg.setLoadOnStartup(1) reg.setAsyncSupported(true) diff --git a/servlet/src/test/scala/org/http4s/servlet/AsyncHttp4sServletSuite.scala b/servlet/src/test/scala/org/http4s/servlet/AsyncHttp4sServletSuite.scala index 885cbd19..24f26a07 100644 --- a/servlet/src/test/scala/org/http4s/servlet/AsyncHttp4sServletSuite.scala +++ b/servlet/src/test/scala/org/http4s/servlet/AsyncHttp4sServletSuite.scala @@ -31,7 +31,6 @@ import org.eclipse.jetty.client.api.{Response => JResponse} import org.eclipse.jetty.client.util.BytesContentProvider import org.eclipse.jetty.client.util.DeferredContentProvider import org.http4s.dsl.io._ -import org.http4s.server.DefaultServiceErrorHandler import org.http4s.syntax.all._ import java.nio.ByteBuffer @@ -255,10 +254,9 @@ class AsyncHttp4sServletSuite extends CatsEffectSuite { clientR.use(get(_, server, "shifted")).assertEquals("shifted") } - private def servlet(dispatcher: Dispatcher[IO]) = new AsyncHttp4sServlet[IO]( - service = service, - servletIo = NonBlockingServletIo[IO](DefaultChunkSize), - serviceErrorHandler = DefaultServiceErrorHandler[IO], - dispatcher = dispatcher, - ) + private def servlet(dispatcher: Dispatcher[IO]) = + AsyncHttp4sServlet + .builder[IO](service, dispatcher) + .withChunkSize(DefaultChunkSize) + .build } diff --git a/servlet/src/test/scala/org/http4s/servlet/RouterInServletSuite.scala b/servlet/src/test/scala/org/http4s/servlet/RouterInServletSuite.scala index 9b743f99..394334a3 100644 --- a/servlet/src/test/scala/org/http4s/servlet/RouterInServletSuite.scala +++ b/servlet/src/test/scala/org/http4s/servlet/RouterInServletSuite.scala @@ -22,7 +22,6 @@ import cats.effect.std.Dispatcher import munit.CatsEffectSuite import org.http4s.HttpRoutes import org.http4s.dsl.io._ -import org.http4s.server.DefaultServiceErrorHandler import org.http4s.server.Router import java.net.URL @@ -137,11 +136,8 @@ class RouterInServletSuite extends CatsEffectSuite { ): Resource[IO, Int] = TestEclipseServer(servlet(routes, dispatcher), contextPath, servletPath) private def servlet(routes: HttpRoutes[IO], dispatcher: Dispatcher[IO]) = - new AsyncHttp4sServlet[IO]( - service = routes.orNotFound, - servletIo = org.http4s.servlet.BlockingServletIo(4096), - serviceErrorHandler = DefaultServiceErrorHandler, - dispatcher = dispatcher, - ) + AsyncHttp4sServlet + .builder[IO](routes.orNotFound, dispatcher) + .build } From eb6c93f7843bde786f5672e06536a675b5766ea7 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Fri, 24 Jun 2022 20:27:45 +0000 Subject: [PATCH 11/55] Update http4s-dsl, ... to 0.23.13 in series/0.23 --- build.sbt | 2 +- servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index f8b0f99a..16959d93 100644 --- a/build.sbt +++ b/build.sbt @@ -26,7 +26,7 @@ lazy val root = tlCrossRootProject.aggregate(servlet, examples) val asyncHttpClientVersion = "2.12.3" val jettyVersion = "9.4.48.v20220622" -val http4sVersion = "0.23.12" +val http4sVersion = "0.23.13" val munitCatsEffectVersion = "1.0.7" val servletApiVersion = "3.1.0" diff --git a/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala b/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala index d963f9f8..c6feed09 100644 --- a/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala +++ b/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala @@ -20,7 +20,7 @@ import javax.servlet._ import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse -@deprecated("Not releated to http4s. Will be removed from public API", "0.23.12") +@deprecated("Not releated to http4s. Will be removed from public API", "0.23.13") trait DefaultFilter extends Filter { override def init(filterConfig: FilterConfig): Unit = {} From ec7cc581855315dd6ed2ab5b1da67824f38009d2 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Fri, 24 Jun 2022 22:32:37 -0400 Subject: [PATCH 12/55] Inherit http4s-core repo from series/0.23 --- .scala-steward.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.scala-steward.conf b/.scala-steward.conf index 7c263d46..453bc14e 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -8,6 +8,8 @@ updates.pin = [ updates.ignore = [ # Inherit from series/0.23 + { groupId = "org.http4s", artifactId = "http4s-dsl" }, + { groupId = "org.http4s", artifactId = "http4s-scalafix-internal" }, { groupId = "org.http4s", artifactId = "sbt-http4s-org" }, { groupId = "org.scala-lang", artifactId = "scala3-library" } ] From 6a7a4679619e0e48433cbbe1c40f9ef9e858ace1 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Fri, 24 Jun 2022 23:52:27 -0400 Subject: [PATCH 13/55] Deprecate constructor, fix bincompat --- .../main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala index b98e9d8c..a4fab5ff 100644 --- a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala +++ b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala @@ -26,11 +26,12 @@ import org.http4s.server._ import javax.servlet._ import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse +import scala.annotation.nowarn import scala.concurrent.duration.Duration -class AsyncHttp4sServlet[F[_]] private[servlet] ( +class AsyncHttp4sServlet[F[_]] @deprecated("Use AsyncHttp4sServlet.builder", "0.23.12") ( httpApp: HttpApp[F], - asyncTimeout: Duration, + asyncTimeout: Duration = Duration.Inf, servletIo: ServletIo[F], serviceErrorHandler: ServiceErrorHandler[F], dispatcher: Dispatcher[F], @@ -151,6 +152,7 @@ object AsyncHttp4sServlet { chunkSize, ) {} + @nowarn("cat=deprecation") def build(implicit F: Async[F]): AsyncHttp4sServlet[F] = new AsyncHttp4sServlet( httpApp, From 74444fb3f3b00b59e65dab9577bc6ce5a4de2dc2 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sat, 25 Jun 2022 04:39:40 +0000 Subject: [PATCH 14/55] Update http4s-scalafix-internal to 0.23.13 in series/0.23 --- .../src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala index a4fab5ff..baa78880 100644 --- a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala +++ b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse import scala.annotation.nowarn import scala.concurrent.duration.Duration -class AsyncHttp4sServlet[F[_]] @deprecated("Use AsyncHttp4sServlet.builder", "0.23.12") ( +class AsyncHttp4sServlet[F[_]] @deprecated("Use AsyncHttp4sServlet.builder", "0.23.13") ( httpApp: HttpApp[F], asyncTimeout: Duration = Duration.Inf, servletIo: ServletIo[F], From 46c0aeca937205671056674e61d6c8c74d15e773 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 05:17:16 +0000 Subject: [PATCH 15/55] Update sbt to 1.7.1 in series/0.23 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index c8fcab54..22af2628 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.2 +sbt.version=1.7.1 From 809500a32128fa1e34f00966b241d0cb91410165 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sun, 17 Jul 2022 02:34:39 +0000 Subject: [PATCH 16/55] Update sbt-http4s-org to 0.14.4 in series/0.23 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e9c30fa1..99d1507d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.2.4") -addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.3") +addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.4") From 2e4888268328e7648897f23c2c805d1a57175110 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sun, 17 Jul 2022 02:35:14 +0000 Subject: [PATCH 17/55] Run prePR with sbt-typelevel Executed command: sbt tlPrePrBotHook --- .github/workflows/ci.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a082de1..a9d4927c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -245,26 +245,6 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.8, rootJVM) - uses: actions/download-artifact@v2 - with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootJVM - - - name: Inflate target directories (2.13.8, rootJVM) - run: | - tar xf targets.tar - rm targets.tar - - - name: Download target directories (2.13.8, rootJVM) - uses: actions/download-artifact@v2 - with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootJVM - - - name: Inflate target directories (2.13.8, rootJVM) - run: | - tar xf targets.tar - rm targets.tar - - name: Download target directories (3.1.3, rootJVM) uses: actions/download-artifact@v2 with: From c872a97179ff05cff63679eb0fa34e5830312576 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 26 Jul 2022 05:17:34 +0000 Subject: [PATCH 18/55] Update http4s-dsl, http4s-server to 0.23.14 in series/0.23 --- build.sbt | 2 +- .../src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala | 2 +- servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 16959d93..82bb8bb5 100644 --- a/build.sbt +++ b/build.sbt @@ -26,7 +26,7 @@ lazy val root = tlCrossRootProject.aggregate(servlet, examples) val asyncHttpClientVersion = "2.12.3" val jettyVersion = "9.4.48.v20220622" -val http4sVersion = "0.23.13" +val http4sVersion = "0.23.14" val munitCatsEffectVersion = "1.0.7" val servletApiVersion = "3.1.0" diff --git a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala index baa78880..3a481958 100644 --- a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala +++ b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse import scala.annotation.nowarn import scala.concurrent.duration.Duration -class AsyncHttp4sServlet[F[_]] @deprecated("Use AsyncHttp4sServlet.builder", "0.23.13") ( +class AsyncHttp4sServlet[F[_]] @deprecated("Use AsyncHttp4sServlet.builder", "0.23.14") ( httpApp: HttpApp[F], asyncTimeout: Duration = Duration.Inf, servletIo: ServletIo[F], diff --git a/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala b/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala index c6feed09..d2900198 100644 --- a/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala +++ b/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala @@ -20,7 +20,7 @@ import javax.servlet._ import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse -@deprecated("Not releated to http4s. Will be removed from public API", "0.23.13") +@deprecated("Not releated to http4s. Will be removed from public API", "0.23.14") trait DefaultFilter extends Filter { override def init(filterConfig: FilterConfig): Unit = {} From bd3384fad80cb9ec12d04b70eba99a4826033580 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Tue, 26 Jul 2022 23:16:01 -0400 Subject: [PATCH 19/55] Inherit sbt from 0.23 --- .scala-steward.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.scala-steward.conf b/.scala-steward.conf index 453bc14e..504ff281 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -11,5 +11,6 @@ updates.ignore = [ { groupId = "org.http4s", artifactId = "http4s-dsl" }, { groupId = "org.http4s", artifactId = "http4s-scalafix-internal" }, { groupId = "org.http4s", artifactId = "sbt-http4s-org" }, - { groupId = "org.scala-lang", artifactId = "scala3-library" } + { groupId = "org.scala-lang", artifactId = "scala3-library" }, + { groupId = "org.scala-sbt", artifactId = "sbt" } ] From 8b3aa3d0611cce65406494af663d24ba6f031172 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Tue, 26 Jul 2022 23:17:24 -0400 Subject: [PATCH 20/55] Inherit http4s-server from series/0.23 --- .scala-steward.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/.scala-steward.conf b/.scala-steward.conf index 453bc14e..4a0c3f3c 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -9,6 +9,7 @@ updates.pin = [ updates.ignore = [ # Inherit from series/0.23 { groupId = "org.http4s", artifactId = "http4s-dsl" }, + { groupId = "org.http4s", artifactId = "http4s-server" }, { groupId = "org.http4s", artifactId = "http4s-scalafix-internal" }, { groupId = "org.http4s", artifactId = "sbt-http4s-org" }, { groupId = "org.scala-lang", artifactId = "scala3-library" } From 9cc47e5942bb8db7595cc1407e650a0a164bd164 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Thu, 11 Aug 2022 20:28:24 +0000 Subject: [PATCH 21/55] Update scalafmt-core to 3.5.9 in series/0.23 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 69f74809..6b1feecf 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.5.8 +version = 3.5.9 style = default From 28cc72dce3a58f8bf0e9093e6dcd79fc915ea5fa Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Thu, 15 Sep 2022 20:31:27 +0000 Subject: [PATCH 22/55] Update jetty-client, jetty-runner, ... to 9.4.49.v20220914 in series/0.23 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 82bb8bb5..60811d9a 100644 --- a/build.sbt +++ b/build.sbt @@ -25,7 +25,7 @@ ThisBuild / scalaVersion := Scala213 // the default Scala lazy val root = tlCrossRootProject.aggregate(servlet, examples) val asyncHttpClientVersion = "2.12.3" -val jettyVersion = "9.4.48.v20220622" +val jettyVersion = "9.4.49.v20220914" val http4sVersion = "0.23.14" val munitCatsEffectVersion = "1.0.7" val servletApiVersion = "3.1.0" From 46c92a86f15ab92cb5d12cd7e7940650176d6ba7 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Thu, 15 Sep 2022 20:31:33 +0000 Subject: [PATCH 23/55] Update jetty-client, jetty-runner, ... to 10.0.12 in series/0.24 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index eed8ee5a..d75a9082 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ ThisBuild / tlJdkRelease := Some(8) lazy val root = tlCrossRootProject.aggregate(servlet, examples) val asyncHttpClientVersion = "2.12.3" -val jettyVersion = "10.0.11" +val jettyVersion = "10.0.12" val http4sVersion = "0.23.12" val munitCatsEffectVersion = "1.0.7" val servletApiVersion = "4.0.1" From 22235f8b42624e32768a105a4c73f332cb0fa304 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Fri, 16 Sep 2022 08:36:15 +0000 Subject: [PATCH 24/55] Update http4s-dsl, http4s-server to 0.23.16 in series/0.23 --- build.sbt | 2 +- .../src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala | 2 +- servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 82bb8bb5..2ab4ad6a 100644 --- a/build.sbt +++ b/build.sbt @@ -26,7 +26,7 @@ lazy val root = tlCrossRootProject.aggregate(servlet, examples) val asyncHttpClientVersion = "2.12.3" val jettyVersion = "9.4.48.v20220622" -val http4sVersion = "0.23.14" +val http4sVersion = "0.23.16" val munitCatsEffectVersion = "1.0.7" val servletApiVersion = "3.1.0" diff --git a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala index 3a481958..718aed26 100644 --- a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala +++ b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse import scala.annotation.nowarn import scala.concurrent.duration.Duration -class AsyncHttp4sServlet[F[_]] @deprecated("Use AsyncHttp4sServlet.builder", "0.23.14") ( +class AsyncHttp4sServlet[F[_]] @deprecated("Use AsyncHttp4sServlet.builder", "0.23.16") ( httpApp: HttpApp[F], asyncTimeout: Duration = Duration.Inf, servletIo: ServletIo[F], diff --git a/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala b/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala index d2900198..d5db7188 100644 --- a/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala +++ b/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala @@ -20,7 +20,7 @@ import javax.servlet._ import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse -@deprecated("Not releated to http4s. Will be removed from public API", "0.23.14") +@deprecated("Not releated to http4s. Will be removed from public API", "0.23.16") trait DefaultFilter extends Filter { override def init(filterConfig: FilterConfig): Unit = {} From 43d89371723e47775479af31ba4a6cc2ff3e3e25 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sat, 17 Sep 2022 02:43:13 +0000 Subject: [PATCH 25/55] Update scala-library to 2.12.17 in series/0.23 --- .github/workflows/ci.yml | 6 +++--- build.sbt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9d4927c..b858551a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,13 +29,13 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - scala: [2.12.16, 2.13.8, 3.1.3] + scala: [2.12.17, 2.13.8, 3.1.3] java: [temurin@8, temurin@11, temurin@17] project: [rootJVM] exclude: - - scala: 2.12.16 + - scala: 2.12.17 java: temurin@11 - - scala: 2.12.16 + - scala: 2.12.17 java: temurin@17 - scala: 3.1.3 java: temurin@11 diff --git a/build.sbt b/build.sbt index 82bb8bb5..ae3824d6 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ ThisBuild / developers := List( ThisBuild / tlSitePublishBranch := Some("main") val Scala213 = "2.13.8" -ThisBuild / crossScalaVersions := Seq("2.12.16", Scala213, "3.1.3") +ThisBuild / crossScalaVersions := Seq("2.12.17", Scala213, "3.1.3") ThisBuild / scalaVersion := Scala213 // the default Scala lazy val root = tlCrossRootProject.aggregate(servlet, examples) From d8dae410ca60b722b0a413b98176b8a16256f814 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sat, 17 Sep 2022 02:43:40 +0000 Subject: [PATCH 26/55] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b858551a..8dbd056f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -225,12 +225,12 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.12.16, rootJVM) + - name: Download target directories (2.12.17, rootJVM) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.16-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM - - name: Inflate target directories (2.12.16, rootJVM) + - name: Inflate target directories (2.12.17, rootJVM) run: | tar xf targets.tar rm targets.tar From 776f841b8013f0a384d598a4989da36f369f2600 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 21 Sep 2022 16:57:00 +0000 Subject: [PATCH 27/55] Update sbt-http4s-org to 0.14.6 in series/0.23 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 99d1507d..660d9cb3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.2.4") -addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.4") +addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.6") From 0cabaf7807e9871ed5037566bb015f19c81a104e Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 21 Sep 2022 16:57:39 +0000 Subject: [PATCH 28/55] Run prePR with sbt-typelevel Executed command: sbt tlPrePrBotHook --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9d4927c..a993793f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,7 +109,7 @@ jobs: key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Check that workflows are up to date - run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' 'project /' githubWorkflowCheck + run: sbt githubWorkflowCheck - name: Check headers and formatting if: matrix.java == 'temurin@8' From d6779a0b0a6487dc6acec61a603fb0c4cd9b5597 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 05:11:29 +0000 Subject: [PATCH 29/55] Update sbt to 1.7.2 in series/0.23 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 22af2628..563a014d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.1 +sbt.version=1.7.2 From 5665a1b7fd424591ba00af72310d438da50c4a55 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 02:32:45 +0000 Subject: [PATCH 30/55] Update scala3-library to 3.2.0 in series/0.23 --- .github/workflows/ci.yml | 6 +++--- build.sbt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9d4927c..7e16d3b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - scala: [2.12.16, 2.13.8, 3.1.3] + scala: [2.12.16, 2.13.8, 3.2.0] java: [temurin@8, temurin@11, temurin@17] project: [rootJVM] exclude: @@ -37,9 +37,9 @@ jobs: java: temurin@11 - scala: 2.12.16 java: temurin@17 - - scala: 3.1.3 + - scala: 3.2.0 java: temurin@11 - - scala: 3.1.3 + - scala: 3.2.0 java: temurin@17 runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 82bb8bb5..e9309841 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ ThisBuild / developers := List( ThisBuild / tlSitePublishBranch := Some("main") val Scala213 = "2.13.8" -ThisBuild / crossScalaVersions := Seq("2.12.16", Scala213, "3.1.3") +ThisBuild / crossScalaVersions := Seq("2.12.16", Scala213, "3.2.0") ThisBuild / scalaVersion := Scala213 // the default Scala lazy val root = tlCrossRootProject.aggregate(servlet, examples) From 212f340a1a1ebe4a609f385cd40d97f458317af3 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 02:33:05 +0000 Subject: [PATCH 31/55] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e16d3b4..22680873 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -245,12 +245,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.1.3, rootJVM) + - name: Download target directories (3.2.0, rootJVM) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.3-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.0-rootJVM - - name: Inflate target directories (3.1.3, rootJVM) + - name: Inflate target directories (3.2.0, rootJVM) run: | tar xf targets.tar rm targets.tar From 3351c132b9faa4e52f3ae785b7725fac3884d9b7 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sun, 9 Oct 2022 21:09:13 +0000 Subject: [PATCH 32/55] Revert commit(s) 22235f8 --- build.sbt | 2 +- .../src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala | 2 +- servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 2ab4ad6a..82bb8bb5 100644 --- a/build.sbt +++ b/build.sbt @@ -26,7 +26,7 @@ lazy val root = tlCrossRootProject.aggregate(servlet, examples) val asyncHttpClientVersion = "2.12.3" val jettyVersion = "9.4.48.v20220622" -val http4sVersion = "0.23.16" +val http4sVersion = "0.23.14" val munitCatsEffectVersion = "1.0.7" val servletApiVersion = "3.1.0" diff --git a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala index 718aed26..3a481958 100644 --- a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala +++ b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse import scala.annotation.nowarn import scala.concurrent.duration.Duration -class AsyncHttp4sServlet[F[_]] @deprecated("Use AsyncHttp4sServlet.builder", "0.23.16") ( +class AsyncHttp4sServlet[F[_]] @deprecated("Use AsyncHttp4sServlet.builder", "0.23.14") ( httpApp: HttpApp[F], asyncTimeout: Duration = Duration.Inf, servletIo: ServletIo[F], diff --git a/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala b/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala index d5db7188..d2900198 100644 --- a/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala +++ b/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala @@ -20,7 +20,7 @@ import javax.servlet._ import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse -@deprecated("Not releated to http4s. Will be removed from public API", "0.23.16") +@deprecated("Not releated to http4s. Will be removed from public API", "0.23.14") trait DefaultFilter extends Filter { override def init(filterConfig: FilterConfig): Unit = {} From ff107ea38122437d2bcd7504c649b9f22d446f16 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sun, 9 Oct 2022 21:09:16 +0000 Subject: [PATCH 33/55] Update http4s-dsl, http4s-server to 0.23.16 in series/0.23 --- build.sbt | 2 +- .../src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala | 2 +- servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index bafbad5c..0942b17f 100644 --- a/build.sbt +++ b/build.sbt @@ -26,7 +26,7 @@ lazy val root = tlCrossRootProject.aggregate(servlet, examples) val asyncHttpClientVersion = "2.12.3" val jettyVersion = "9.4.49.v20220914" -val http4sVersion = "0.23.14" +val http4sVersion = "0.23.16" val munitCatsEffectVersion = "1.0.7" val servletApiVersion = "3.1.0" diff --git a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala index 3a481958..718aed26 100644 --- a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala +++ b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse import scala.annotation.nowarn import scala.concurrent.duration.Duration -class AsyncHttp4sServlet[F[_]] @deprecated("Use AsyncHttp4sServlet.builder", "0.23.14") ( +class AsyncHttp4sServlet[F[_]] @deprecated("Use AsyncHttp4sServlet.builder", "0.23.16") ( httpApp: HttpApp[F], asyncTimeout: Duration = Duration.Inf, servletIo: ServletIo[F], diff --git a/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala b/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala index d2900198..d5db7188 100644 --- a/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala +++ b/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala @@ -20,7 +20,7 @@ import javax.servlet._ import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse -@deprecated("Not releated to http4s. Will be removed from public API", "0.23.14") +@deprecated("Not releated to http4s. Will be removed from public API", "0.23.16") trait DefaultFilter extends Filter { override def init(filterConfig: FilterConfig): Unit = {} From 10b4238909220ef27be6a66b987d7b0e29e74d86 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sun, 9 Oct 2022 21:09:18 +0000 Subject: [PATCH 34/55] Revert commit(s) d8dae41, 43d8937 --- .github/workflows/ci.yml | 12 ++++++------ build.sbt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8dbd056f..a9d4927c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,13 +29,13 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - scala: [2.12.17, 2.13.8, 3.1.3] + scala: [2.12.16, 2.13.8, 3.1.3] java: [temurin@8, temurin@11, temurin@17] project: [rootJVM] exclude: - - scala: 2.12.17 + - scala: 2.12.16 java: temurin@11 - - scala: 2.12.17 + - scala: 2.12.16 java: temurin@17 - scala: 3.1.3 java: temurin@11 @@ -225,12 +225,12 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.12.17, rootJVM) + - name: Download target directories (2.12.16, rootJVM) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.16-rootJVM - - name: Inflate target directories (2.12.17, rootJVM) + - name: Inflate target directories (2.12.16, rootJVM) run: | tar xf targets.tar rm targets.tar diff --git a/build.sbt b/build.sbt index ae3824d6..82bb8bb5 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ ThisBuild / developers := List( ThisBuild / tlSitePublishBranch := Some("main") val Scala213 = "2.13.8" -ThisBuild / crossScalaVersions := Seq("2.12.17", Scala213, "3.1.3") +ThisBuild / crossScalaVersions := Seq("2.12.16", Scala213, "3.1.3") ThisBuild / scalaVersion := Scala213 // the default Scala lazy val root = tlCrossRootProject.aggregate(servlet, examples) From 0465a0dd72d550d29fdd96c948a7753df293c081 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sun, 9 Oct 2022 21:09:21 +0000 Subject: [PATCH 35/55] Update scala-library to 2.12.17 in series/0.23 --- .github/workflows/ci.yml | 6 +++--- build.sbt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48c70295..7258e401 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,13 +29,13 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - scala: [2.12.16, 2.13.8, 3.2.0] + scala: [2.12.17, 2.13.8, 3.2.0] java: [temurin@8, temurin@11, temurin@17] project: [rootJVM] exclude: - - scala: 2.12.16 + - scala: 2.12.17 java: temurin@11 - - scala: 2.12.16 + - scala: 2.12.17 java: temurin@17 - scala: 3.2.0 java: temurin@11 diff --git a/build.sbt b/build.sbt index bafbad5c..f6c4bc0a 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ ThisBuild / developers := List( ThisBuild / tlSitePublishBranch := Some("main") val Scala213 = "2.13.8" -ThisBuild / crossScalaVersions := Seq("2.12.16", Scala213, "3.2.0") +ThisBuild / crossScalaVersions := Seq("2.12.17", Scala213, "3.2.0") ThisBuild / scalaVersion := Scala213 // the default Scala lazy val root = tlCrossRootProject.aggregate(servlet, examples) From 0ba181bfd6087669f47e083a727da8e06ea5729b Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sun, 9 Oct 2022 21:09:42 +0000 Subject: [PATCH 36/55] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7258e401..23210390 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -225,12 +225,12 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.12.16, rootJVM) + - name: Download target directories (2.12.17, rootJVM) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.16-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM - - name: Inflate target directories (2.12.16, rootJVM) + - name: Inflate target directories (2.12.17, rootJVM) run: | tar xf targets.tar rm targets.tar From 568f6442e3d6367907644c4e39c3456f144980bf Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 02:48:04 +0000 Subject: [PATCH 37/55] Update sbt-http4s-org to 0.14.7 in series/0.23 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 660d9cb3..8b950ab7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.2.4") -addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.6") +addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.7") From c036e8660ff63637aa637dd2a02f747cecf609f3 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 16:58:28 +0000 Subject: [PATCH 38/55] Update scala-library to 2.13.10 in series/0.23 --- .github/workflows/ci.yml | 6 +++--- build.sbt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23210390..2692f553 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - scala: [2.12.17, 2.13.8, 3.2.0] + scala: [2.12.17, 2.13.10, 3.2.0] java: [temurin@8, temurin@11, temurin@17] project: [rootJVM] exclude: @@ -156,7 +156,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.8] + scala: [2.13.10] java: [temurin@8] runs-on: ${{ matrix.os }} steps: @@ -274,7 +274,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.8] + scala: [2.13.10] java: [temurin@8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index fbec701a..80b9649c 100644 --- a/build.sbt +++ b/build.sbt @@ -18,7 +18,7 @@ ThisBuild / developers := List( // publish website from this branch ThisBuild / tlSitePublishBranch := Some("main") -val Scala213 = "2.13.8" +val Scala213 = "2.13.10" ThisBuild / crossScalaVersions := Seq("2.12.17", Scala213, "3.2.0") ThisBuild / scalaVersion := Scala213 // the default Scala From 6153d6b92b046d2e0c6da720bb092dfb903c1f72 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 16:58:53 +0000 Subject: [PATCH 39/55] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2692f553..b48efdcf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -235,12 +235,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.8, rootJVM) + - name: Download target directories (2.13.10, rootJVM) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJVM - - name: Inflate target directories (2.13.8, rootJVM) + - name: Inflate target directories (2.13.10, rootJVM) run: | tar xf targets.tar rm targets.tar From 309312a5dc7856f5c41b93e4f5b0de0def707bb3 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 17 Oct 2022 16:52:37 +0000 Subject: [PATCH 40/55] Update scalafmt-core to 3.6.0 in series/0.23 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 6b1feecf..53f045f2 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.5.9 +version = 3.6.0 style = default From 88bcb592512f249d990bda9be20a8e058734fc3a Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 02:41:34 +0000 Subject: [PATCH 41/55] Update sbt to 1.7.3 in series/0.23 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 563a014d..6a9f0388 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.2 +sbt.version=1.7.3 From 1f34250bda69020a0cc5d772412299b0c2bd6e7e Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 1 Nov 2022 02:41:23 +0000 Subject: [PATCH 42/55] Update scalafmt-core to 3.6.1 in series/0.23 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 53f045f2..1e85fdad 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.6.0 +version = 3.6.1 style = default From cec82891449695050346952393ee4d779c6414b5 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 20:38:32 +0000 Subject: [PATCH 43/55] Update scala3-library to 3.2.1 in series/0.23 --- .github/workflows/ci.yml | 6 +++--- build.sbt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b48efdcf..80da408d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - scala: [2.12.17, 2.13.10, 3.2.0] + scala: [2.12.17, 2.13.10, 3.2.1] java: [temurin@8, temurin@11, temurin@17] project: [rootJVM] exclude: @@ -37,9 +37,9 @@ jobs: java: temurin@11 - scala: 2.12.17 java: temurin@17 - - scala: 3.2.0 + - scala: 3.2.1 java: temurin@11 - - scala: 3.2.0 + - scala: 3.2.1 java: temurin@17 runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 80b9649c..cd218831 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ ThisBuild / developers := List( ThisBuild / tlSitePublishBranch := Some("main") val Scala213 = "2.13.10" -ThisBuild / crossScalaVersions := Seq("2.12.17", Scala213, "3.2.0") +ThisBuild / crossScalaVersions := Seq("2.12.17", Scala213, "3.2.1") ThisBuild / scalaVersion := Scala213 // the default Scala lazy val root = tlCrossRootProject.aggregate(servlet, examples) From bf4211d8f8d5f3da7025035670cc6b110f129541 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 20:38:57 +0000 Subject: [PATCH 44/55] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80da408d..ab4bbd4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -245,12 +245,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.0, rootJVM) + - name: Download target directories (3.2.1, rootJVM) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.0-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1-rootJVM - - name: Inflate target directories (3.2.0, rootJVM) + - name: Inflate target directories (3.2.1, rootJVM) run: | tar xf targets.tar rm targets.tar From 1eaee849467b9beb24e56658491d8256454f0312 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 16:46:21 +0000 Subject: [PATCH 45/55] Update sbt-http4s-org to 0.14.9 in series/0.23 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 8b950ab7..ab1a29f0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.2.4") -addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.7") +addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.9") From bf5509ea78484c9ef5f9b14b01a66a8ee10e94f3 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 16:47:10 +0000 Subject: [PATCH 46/55] Run prePR with sbt-typelevel Executed command: sbt tlPrePrBotHook --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b48efdcf..e6f4b242 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -113,26 +113,26 @@ jobs: - name: Check headers and formatting if: matrix.java == 'temurin@8' - run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck - name: Test - run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' test + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test - name: Check binary compatibility if: matrix.java == 'temurin@8' - run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' mimaReportBinaryIssues + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues - name: Generate API documentation if: matrix.java == 'temurin@8' - run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' doc + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc - name: Check scalafix lints if: matrix.java == 'temurin@8' && !startsWith(matrix.scala, '3.') - run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' 'scalafixAll --check' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check' - name: Check unused compile dependencies if: matrix.java == 'temurin@8' - run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' unusedCompileDependenciesTest + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' unusedCompileDependenciesTest - name: Make target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') @@ -267,7 +267,7 @@ jobs: (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1) - name: Publish - run: sbt '++${{ matrix.scala }}' tlRelease + run: sbt '++ ${{ matrix.scala }}' tlRelease site: name: Generate Site @@ -344,7 +344,7 @@ jobs: key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Generate site - run: sbt '++${{ matrix.scala }}' docs/tlSite + run: sbt '++ ${{ matrix.scala }}' docs/tlSite - name: Publish site if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' From 2508c0616c59e3e7056e6884c8967080bc9499a1 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 29 Nov 2022 07:47:05 +0000 Subject: [PATCH 47/55] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'typelevel-nix': 'github:typelevel/typelevel-nix/1389f4541486669ded4648abf72e178f97563fd1' (2022-03-21) → 'github:typelevel/typelevel-nix/6e7a02bffe3e654737a125e61d1d6690e8080ae1' (2022-11-28) • Updated input 'typelevel-nix/devshell': 'github:numtide/devshell/f1c3e65d20f14870fa51d762e9e54c816fe356ef' (2022-03-17) → 'github:numtide/devshell/96a9dd12b8a447840cc246e17a47b81a4268bba7' (2022-10-31) • Removed input 'typelevel-nix/flake-compat' • Updated input 'typelevel-nix/flake-utils': 'github:numtide/flake-utils/3cecb5b042f7f209c56ffd8371b2711a290ec797' (2022-02-07) → 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) • Updated input 'typelevel-nix/nixpkgs': 'github:nixos/nixpkgs/3eb07eeafb52bcbf02ce800f032f18d666a9498d' (2022-03-15) → 'github:nixos/nixpkgs/b45ec953794bb07922f0468152ad1ebaf8a084b3' (2022-11-27) --- flake.lock | 41 ++++++++++++----------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index a1831362..439f762b 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1647507059, - "narHash": "sha256-1JyNnvQh1X7YhSyau1oNSv4WaTIIe/nUZYNffFzAO/g=", + "lastModified": 1667210711, + "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", "owner": "numtide", "repo": "devshell", - "rev": "f1c3e65d20f14870fa51d762e9e54c816fe356ef", + "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", "type": "github" }, "original": { @@ -19,22 +19,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1642700792, @@ -52,11 +36,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -83,11 +67,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1647350163, - "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", + "lastModified": 1669535121, + "narHash": "sha256-koZLM7oWVGrjyHnYDo7/w5qlmUn9UZUKSFNfmIjueE8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", + "rev": "b45ec953794bb07922f0468152ad1ebaf8a084b3", "type": "github" }, "original": { @@ -113,16 +97,15 @@ "typelevel-nix": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat", "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1647876418, - "narHash": "sha256-CNmzyjafmOkr0xZhHcShLAWw1TOKVv5Ettq8uSy3/lM=", + "lastModified": 1669658777, + "narHash": "sha256-zq1yQghqcRhGze9lEslfwCl5+IKkjfJJoFKhUC3TwYY=", "owner": "typelevel", "repo": "typelevel-nix", - "rev": "1389f4541486669ded4648abf72e178f97563fd1", + "rev": "6e7a02bffe3e654737a125e61d1d6690e8080ae1", "type": "github" }, "original": { From 7cb25c88190ae2ee9481ced226c39fb9a0cd52b3 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 07:46:53 +0000 Subject: [PATCH 48/55] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'typelevel-nix': 'github:typelevel/typelevel-nix/6e7a02bffe3e654737a125e61d1d6690e8080ae1' (2022-11-28) → 'github:typelevel/typelevel-nix/2569b77a2d50845a0e2dbf8d295f5078ff1d703d' (2022-11-30) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 439f762b..ddcfb50f 100644 --- a/flake.lock +++ b/flake.lock @@ -101,11 +101,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1669658777, - "narHash": "sha256-zq1yQghqcRhGze9lEslfwCl5+IKkjfJJoFKhUC3TwYY=", + "lastModified": 1669836539, + "narHash": "sha256-pPext6yfnSNBzTf7YlohZ8PYWQGSZkhKlYn17aeeiLM=", "owner": "typelevel", "repo": "typelevel-nix", - "rev": "6e7a02bffe3e654737a125e61d1d6690e8080ae1", + "rev": "2569b77a2d50845a0e2dbf8d295f5078ff1d703d", "type": "github" }, "original": { From 8cf10cf838828518c9849fa61bf560bfda0d19a9 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 01:44:40 +0000 Subject: [PATCH 49/55] Update jetty-client, jetty-runner, ... to 9.4.50.v20221201 in series/0.23 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 80b9649c..f49cb34d 100644 --- a/build.sbt +++ b/build.sbt @@ -25,7 +25,7 @@ ThisBuild / scalaVersion := Scala213 // the default Scala lazy val root = tlCrossRootProject.aggregate(servlet, examples) val asyncHttpClientVersion = "2.12.3" -val jettyVersion = "9.4.49.v20220914" +val jettyVersion = "9.4.50.v20221201" val http4sVersion = "0.23.16" val munitCatsEffectVersion = "1.0.7" val servletApiVersion = "3.1.0" From b3305035567a5687d50eb9a5009ef4502ca550ee Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sat, 10 Dec 2022 01:38:44 +0000 Subject: [PATCH 50/55] Update jetty-client, jetty-runner, ... to 10.0.13 in series/0.24 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d75a9082..ee940f4d 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ ThisBuild / tlJdkRelease := Some(8) lazy val root = tlCrossRootProject.aggregate(servlet, examples) val asyncHttpClientVersion = "2.12.3" -val jettyVersion = "10.0.12" +val jettyVersion = "10.0.13" val http4sVersion = "0.23.12" val munitCatsEffectVersion = "1.0.7" val servletApiVersion = "4.0.1" From 1e365cb15303dd543b80674fe5dee7f18ab43d82 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 3 Jan 2023 07:47:00 +0000 Subject: [PATCH 51/55] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'typelevel-nix': 'github:typelevel/typelevel-nix/2569b77a2d50845a0e2dbf8d295f5078ff1d703d' (2022-11-30) → 'github:typelevel/typelevel-nix/27b58dea50fcd1d185df9ea3024bb2e914dce0b4' (2023-01-02) • Updated input 'typelevel-nix/devshell': 'github:numtide/devshell/96a9dd12b8a447840cc246e17a47b81a4268bba7' (2022-10-31) → 'github:numtide/devshell/5aa3a8039c68b4bf869327446590f4cdf90bb634' (2022-12-19) • Updated input 'typelevel-nix/nixpkgs': 'github:nixos/nixpkgs/b45ec953794bb07922f0468152ad1ebaf8a084b3' (2022-11-27) → 'github:nixos/nixpkgs/293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847' (2022-12-30) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index ddcfb50f..e3522b75 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1667210711, - "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", + "lastModified": 1671489820, + "narHash": "sha256-qoei5HDJ8psd1YUPD7DhbHdhLIT9L2nadscp4Qk37uk=", "owner": "numtide", "repo": "devshell", - "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", + "rev": "5aa3a8039c68b4bf869327446590f4cdf90bb634", "type": "github" }, "original": { @@ -67,11 +67,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1669535121, - "narHash": "sha256-koZLM7oWVGrjyHnYDo7/w5qlmUn9UZUKSFNfmIjueE8=", + "lastModified": 1672428209, + "narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b45ec953794bb07922f0468152ad1ebaf8a084b3", + "rev": "293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847", "type": "github" }, "original": { @@ -101,11 +101,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1669836539, - "narHash": "sha256-pPext6yfnSNBzTf7YlohZ8PYWQGSZkhKlYn17aeeiLM=", + "lastModified": 1672639231, + "narHash": "sha256-n2S6kRPr7IE9BQSqK1KL9HxVNxL16I4js/GW0ZAa73w=", "owner": "typelevel", "repo": "typelevel-nix", - "rev": "2569b77a2d50845a0e2dbf8d295f5078ff1d703d", + "rev": "27b58dea50fcd1d185df9ea3024bb2e914dce0b4", "type": "github" }, "original": { From 36da886dd8b36f6da2af4370ef20a9ff5aeb7a5c Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 4 Jan 2023 01:47:17 +0000 Subject: [PATCH 52/55] Update sbt to 1.8.1 in series/0.23 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 6a9f0388..c13a9b3a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.3 +sbt.version=1.8.1 From fee99fa28ecced540a213a49a453a8fd0937f2b7 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 4 Jan 2023 16:44:05 +0000 Subject: [PATCH 53/55] Update http4s-dsl, ... to 0.23.17 in series/0.23 --- build.sbt | 2 +- .../src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala | 2 +- servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 25a45389..76410da4 100644 --- a/build.sbt +++ b/build.sbt @@ -26,7 +26,7 @@ lazy val root = tlCrossRootProject.aggregate(servlet, examples) val asyncHttpClientVersion = "2.12.3" val jettyVersion = "9.4.50.v20221201" -val http4sVersion = "0.23.16" +val http4sVersion = "0.23.17" val munitCatsEffectVersion = "1.0.7" val servletApiVersion = "3.1.0" diff --git a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala index 718aed26..32cd3a97 100644 --- a/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala +++ b/servlet/src/main/scala/org/http4s/servlet/AsyncHttp4sServlet.scala @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse import scala.annotation.nowarn import scala.concurrent.duration.Duration -class AsyncHttp4sServlet[F[_]] @deprecated("Use AsyncHttp4sServlet.builder", "0.23.16") ( +class AsyncHttp4sServlet[F[_]] @deprecated("Use AsyncHttp4sServlet.builder", "0.23.17") ( httpApp: HttpApp[F], asyncTimeout: Duration = Duration.Inf, servletIo: ServletIo[F], diff --git a/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala b/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala index d5db7188..92032ef6 100644 --- a/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala +++ b/servlet/src/main/scala/org/http4s/servlet/DefaultFilter.scala @@ -20,7 +20,7 @@ import javax.servlet._ import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse -@deprecated("Not releated to http4s. Will be removed from public API", "0.23.16") +@deprecated("Not releated to http4s. Will be removed from public API", "0.23.17") trait DefaultFilter extends Filter { override def init(filterConfig: FilterConfig): Unit = {} From cb080ffc038a81a1c3994adb51c80cefba34bb3b Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Wed, 4 Jan 2023 18:11:19 -0500 Subject: [PATCH 54/55] Fix deprecations --- .../main/scala/com/example/Bootstrap.scala | 4 +++- .../servlet/AsyncHttp4sServletSuite.scala | 11 ++++++---- .../servlet/BlockingHttp4sServletSuite.scala | 2 +- .../http4s/servlet/RouterInServletSuite.scala | 20 ++++++++++++------- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/examples/src/main/scala/com/example/Bootstrap.scala b/examples/src/main/scala/com/example/Bootstrap.scala index 93b0da4a..09983ffb 100644 --- a/examples/src/main/scala/com/example/Bootstrap.scala +++ b/examples/src/main/scala/com/example/Bootstrap.scala @@ -40,7 +40,9 @@ class Bootstrap extends ServletContextListener { @volatile private var shutdown: IO[Unit] = IO.unit override def contextInitialized(sce: ServletContextEvent): Unit = { - Dispatcher[IO].allocated + Dispatcher + .parallel[IO] + .allocated .flatMap { case (dispatcher, shutdown) => IO(this.shutdown = shutdown) *> IO(sce.getServletContext.mountRoutes("example", routes, dispatcher = dispatcher)) diff --git a/servlet/src/test/scala/org/http4s/servlet/AsyncHttp4sServletSuite.scala b/servlet/src/test/scala/org/http4s/servlet/AsyncHttp4sServletSuite.scala index 24f26a07..46e67b44 100644 --- a/servlet/src/test/scala/org/http4s/servlet/AsyncHttp4sServletSuite.scala +++ b/servlet/src/test/scala/org/http4s/servlet/AsyncHttp4sServletSuite.scala @@ -57,7 +57,7 @@ class AsyncHttp4sServletSuite extends CatsEffectSuite { .orNotFound private val servletServer = - ResourceFixture[Int](Dispatcher[IO].flatMap(d => TestEclipseServer(servlet(d)))) + ResourceFixture[Int](Dispatcher.parallel[IO].flatMap(d => TestEclipseServer(servlet(d)))) private def get(client: HttpClient, serverPort: Int, path: String): IO[String] = IO.blocking( @@ -134,7 +134,8 @@ class AsyncHttp4sServletSuite extends CatsEffectSuite { servletServer.test("AsyncHttp4sServlet handle two-chunk, deferred POST") { server => // Show that we can read, be blocked, and read again val bytes = Stream.range(0, DefaultChunkSize).map(_.toByte).to(Array) - Dispatcher[IO] + Dispatcher + .parallel[IO] .use { dispatcher => clientR.use { client => for { @@ -174,7 +175,8 @@ class AsyncHttp4sServletSuite extends CatsEffectSuite { // We shouldn't block when we receive less than a chunk at a time servletServer.test("AsyncHttp4sServlet handle two itsy-bitsy deferred chunk POST") { server => - Dispatcher[IO] + Dispatcher + .parallel[IO] .use { dispatcher => clientR.use { client => for { @@ -214,7 +216,8 @@ class AsyncHttp4sServletSuite extends CatsEffectSuite { servletServer.test("AsyncHttp4sServlet should not reorder lots of itsy-bitsy chunks") { server => val body = (0 until 4096).map(_.toByte).toArray - Dispatcher[IO] + Dispatcher + .parallel[IO] .use { dispatcher => clientR.use { client => for { diff --git a/servlet/src/test/scala/org/http4s/servlet/BlockingHttp4sServletSuite.scala b/servlet/src/test/scala/org/http4s/servlet/BlockingHttp4sServletSuite.scala index e8491e8d..79070f11 100644 --- a/servlet/src/test/scala/org/http4s/servlet/BlockingHttp4sServletSuite.scala +++ b/servlet/src/test/scala/org/http4s/servlet/BlockingHttp4sServletSuite.scala @@ -48,7 +48,7 @@ class BlockingHttp4sServletSuite extends CatsEffectSuite { .orNotFound private val servletServer = ResourceFixture( - Dispatcher[IO].flatMap(d => TestEclipseServer(servlet(d))) + Dispatcher.parallel[IO].flatMap(d => TestEclipseServer(servlet(d))) ) private def get(serverPort: Int, path: String): IO[String] = diff --git a/servlet/src/test/scala/org/http4s/servlet/RouterInServletSuite.scala b/servlet/src/test/scala/org/http4s/servlet/RouterInServletSuite.scala index 394334a3..2e87cc97 100644 --- a/servlet/src/test/scala/org/http4s/servlet/RouterInServletSuite.scala +++ b/servlet/src/test/scala/org/http4s/servlet/RouterInServletSuite.scala @@ -45,22 +45,28 @@ class RouterInServletSuite extends CatsEffectSuite { ) private val serverWithoutRouter = - ResourceFixture[Int](Dispatcher[IO].flatMap(d => mkServer(mainRoutes, dispatcher = d))) + ResourceFixture[Int](Dispatcher.parallel[IO].flatMap(d => mkServer(mainRoutes, dispatcher = d))) private val server = - ResourceFixture[Int](Dispatcher[IO].flatMap(d => mkServer(router, dispatcher = d))) + ResourceFixture[Int](Dispatcher.parallel[IO].flatMap(d => mkServer(router, dispatcher = d))) private val serverWithContextPath = ResourceFixture[Int]( - Dispatcher[IO].flatMap(d => mkServer(router, contextPath = "/context", dispatcher = d)) + Dispatcher + .parallel[IO] + .flatMap(d => mkServer(router, contextPath = "/context", dispatcher = d)) ) private val serverWithServletPath = ResourceFixture[Int]( - Dispatcher[IO].flatMap(d => mkServer(router, servletPath = "/servlet/*", dispatcher = d)) + Dispatcher + .parallel[IO] + .flatMap(d => mkServer(router, servletPath = "/servlet/*", dispatcher = d)) ) private val serverWithContextAndServletPath = ResourceFixture[Int]( - Dispatcher[IO].flatMap(d => - mkServer(router, contextPath = "/context", servletPath = "/servlet/*", dispatcher = d) - ) + Dispatcher + .parallel[IO] + .flatMap(d => + mkServer(router, contextPath = "/context", servletPath = "/servlet/*", dispatcher = d) + ) ) serverWithoutRouter.test( From 8e00103f5501ad7f90b550fe28a859101ffd39b0 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Wed, 4 Jan 2023 21:59:43 -0500 Subject: [PATCH 55/55] Unpin from 0.23, which is EOL --- .scala-steward.conf | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.scala-steward.conf b/.scala-steward.conf index fba92d06..db16dc1d 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -5,13 +5,3 @@ updates.pin = [ { groupId = "org.eclipse.jetty", version = "10." }, { groupId = "org.eclipse.jetty.http2", version = "10." } ] - -updates.ignore = [ - # Inherit from series/0.23 - { groupId = "org.http4s", artifactId = "http4s-dsl" }, - { groupId = "org.http4s", artifactId = "http4s-server" }, - { groupId = "org.http4s", artifactId = "http4s-scalafix-internal" }, - { groupId = "org.http4s", artifactId = "sbt-http4s-org" }, - { groupId = "org.scala-lang", artifactId = "scala3-library" }, - { groupId = "org.scala-sbt", artifactId = "sbt" } -]