Merge branch 'series/0.24' into series/0.25

Author: rossabaker

.github/workflows/ci.yml

@@ -9,9 +9,9 @@ name: Continuous Integration
 
 on:
   pull_request:
-    branches: ['**', '!update/**']
+    branches: ['**', '!update/**', '!pr/**']
   push:
-    branches: ['**', '!update/**']
+    branches: ['**', '!update/**', '!pr/**']
     tags: [v*]
 
 env:
@@ -29,10 +29,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.8, 3.1.2]
+        scala: [2.12.16, 2.13.8, 3.1.2]
         java: [temurin@11, temurin@17]
         project: [rootJVM]
         exclude:
+          - scala: 2.12.16
+            java: temurin@17
           - scala: 3.1.2
             java: temurin@17
     runs-on: ${{ matrix.os }}
@@ -187,6 +189,16 @@ 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)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.16-rootJVM
+
+      - name: Inflate target directories (2.12.16, rootJVM)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - name: Download target directories (2.13.8, rootJVM)
         uses: actions/download-artifact@v2
         with:

README.md

@@ -0,0 +1,24 @@
+# http4s-servlet
+
+Runs http4s apps as Java servlets.  Provides components for the [http4s-jetty][http4s-jetty] and [http4s-tomcat][http4s-tomcat]
+
+[http4s-jetty]: https://github.com/http4s/http4s-jetty
+
+## SBT coordinates
+
+```scala
+libraryDependencies ++= Seq(
+  "org.http4s" %% "http4s-servlet" % http4sScalatagsV
+)
+```
+
+## Compatibility
+
+| http4s-servlet | http4s-core | servlet-api | Scala 2.12 | Scala 2.13 | Scala 3 | Status    |
+|:---------------|:------------|:------------|------------|------------|---------|:----------|
+| 0.23.x         | 0.23.x      | 3.1         | ✅         | ✅         | ✅      | Stable    |
+| 0.24.x         | 0.23.x      | 4.0         | ✅         | ✅         | ✅      | Milestone |
+| 0.25.x         | 0.23.x      | 5.0         | ✅         | ✅         | ✅      | Milestone |
+
+[http4s-jetty]: https://github.com/http4s/http4s-jetty/
+[http4s-tomcat]: https://github.com/http4s/http4s-tomcat/

build.sbt

@@ -11,7 +11,7 @@ ThisBuild / developers := List(
 ThisBuild / tlSitePublishBranch := Some("main")
 
 val Scala213 = "2.13.8"
-ThisBuild / crossScalaVersions := Seq(Scala213, "3.1.2")
+ThisBuild / crossScalaVersions := Seq("2.12.16", Scala213, "3.1.2")
 ThisBuild / scalaVersion := Scala213 // the default Scala
 
 // Jetty 10+, for testing, requires Java 11.

project/plugins.sbt

@@ -1,2 +1,2 @@
 addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.2.4")
-addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.2")
+addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.3")

servlet/src/main/scala/org/http4s/servlet/ServletIo.scala

@@ -138,7 +138,7 @@ final case class NonBlockingServletIo[F[_]](chunkSize: Int)(implicit F: Async[F]
 
           def unsafeRunAndForget[A](fa: F[A]): Unit =
             dispatcher.unsafeRunAndForget(
-              fa.onError(t => F.delay(logger.error(t)("Error in servlet read listener")))
+              fa.onError { case t => F.delay(logger.error(t)("Error in servlet read listener")) }
             )
         })))
 
@@ -208,7 +208,7 @@ final case class NonBlockingServletIo[F[_]](chunkSize: Int)(implicit F: Async[F]
 
             def unsafeRunAndForget[A](fa: F[A]): Unit =
               dispatcher.unsafeRunAndForget(
-                fa.onError(t => F.delay(logger.error(t)("Error in servlet write listener")))
+                fa.onError { case t => F.delay(logger.error(t)("Error in servlet write listener")) }
               )
           }))