Merge pull request #399 from kevin-lee/servlet-5-and-6-for-0.22

Author: rossabaker

.github/workflows/ci.yml

@@ -29,12 +29,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        scala: [2.13, 3]
-        java: [temurin@8, temurin@11, temurin@17]
+        scala: [2.12, 2.13, 3]
+        java: [temurin@11, temurin@17]
         project: [rootJVM]
         exclude:
-          - scala: 3
-            java: temurin@11
+          - scala: 2.12
+            java: temurin@17
           - scala: 3
             java: temurin@17
     runs-on: ${{ matrix.os }}
@@ -48,19 +48,6 @@ jobs:
       - name: Setup sbt
         uses: sbt/setup-sbt@v1
 
-      - name: Setup Java (temurin@8)
-        id: setup-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 8
-          cache: sbt
-
-      - name: sbt update
-        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
-        run: sbt +update
-
       - name: Setup Java (temurin@11)
         id: setup-java-temurin-11
         if: matrix.java == 'temurin@11'
@@ -91,35 +78,35 @@ jobs:
         run: sbt githubWorkflowCheck
 
       - name: Check headers and formatting
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
+        if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
 
       - name: Test
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
 
       - name: Check binary compatibility
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
+        if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
 
       - name: Generate API documentation
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
+        if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
 
       - name: Check scalafix lints
-        if: matrix.java == 'temurin@8' && !startsWith(matrix.scala, '3')
+        if: matrix.java == 'temurin@11' && !startsWith(matrix.scala, '3')
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check'
 
       - name: Check unused compile dependencies
-        if: matrix.java == 'temurin@8'
+        if: matrix.java == 'temurin@11'
         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')
-        run: mkdir -p servlet/target project/target
+        run: mkdir -p servlet4/target servlet6/target servlet5/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: tar cf targets.tar servlet/target project/target
+        run: tar cf targets.tar servlet4/target servlet6/target servlet5/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
@@ -135,7 +122,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-22.04]
-        java: [temurin@8]
+        java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -146,19 +133,6 @@ jobs:
       - name: Setup sbt
         uses: sbt/setup-sbt@v1
 
-      - name: Setup Java (temurin@8)
-        id: setup-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 8
-          cache: sbt
-
-      - name: sbt update
-        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
-        run: sbt +update
-
       - name: Setup Java (temurin@11)
         id: setup-java-temurin-11
         if: matrix.java == 'temurin@11'
@@ -185,6 +159,16 @@ jobs:
         if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
         run: sbt +update
 
+      - name: Download target directories (2.12, rootJVM)
+        uses: actions/download-artifact@v4
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM
+
+      - name: Inflate target directories (2.12, rootJVM)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - name: Download target directories (2.13, rootJVM)
         uses: actions/download-artifact@v4
         with:
@@ -235,7 +219,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-22.04]
-        java: [temurin@8]
+        java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -246,19 +230,6 @@ jobs:
       - name: Setup sbt
         uses: sbt/setup-sbt@v1
 
-      - name: Setup Java (temurin@8)
-        id: setup-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 8
-          cache: sbt
-
-      - name: sbt update
-        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
-        run: sbt +update
-
       - name: Setup Java (temurin@11)
         id: setup-java-temurin-11
         if: matrix.java == 'temurin@11'
@@ -288,5 +259,5 @@ jobs:
       - name: Submit Dependencies
         uses: scalacenter/sbt-dependency-submission@v2
         with:
-          modules-ignore: rootjs_2.13 rootjs_3 testing_2.13 testing_3 rootjvm_2.13 rootjvm_3 rootnative_2.13 rootnative_3 sbt-http4s-org-scalafix-internal_2.13 sbt-http4s-org-scalafix-internal_3
+          modules-ignore: http4s-servlet-examples-servlet5_2.12 http4s-servlet-examples-servlet5_2.13 http4s-servlet-examples-servlet5_3 rootjs_2.12 rootjs_2.13 rootjs_3 http4s-servlet-examples-servlet6_2.12 http4s-servlet-examples-servlet6_2.13 http4s-servlet-examples-servlet6_3 http4s-testing_2.12 http4s-testing_2.13 http4s-testing_3 rootjvm_2.12 rootjvm_2.13 rootjvm_3 rootnative_2.12 rootnative_2.13 rootnative_3 sbt-http4s-org-scalafix-internal_2.12 sbt-http4s-org-scalafix-internal_2.13 sbt-http4s-org-scalafix-internal_3 http4s-servlet-examples-servlet4_2.12 http4s-servlet-examples-servlet4_2.13 http4s-servlet-examples-servlet4_3
           configs-ignore: test scala-tool scala-doc-tool test-internal

.scalafix.conf

@@ -0,0 +1,14 @@
+rules = [
+  Http4sGeneralLinters
+  Http4sUseLiteralsSyntax
+  LeakingImplicitClassVal
+  ExplicitResultTypes
+  OrganizeImports
+]
+
+triggered.rules = [
+  Http4sGeneralLinters
+  Http4sUseLiteralsSyntax
+  LeakingImplicitClassVal
+]
+

build.sbt

@@ -1,4 +1,4 @@
-ThisBuild / tlBaseVersion := "0.23" // your current series x.y
+ThisBuild / tlBaseVersion := "0.22" // your current series x.y
 
 ThisBuild / licenses := Seq(License.Apache2)
 ThisBuild / developers := List(
@@ -7,37 +7,155 @@ ThisBuild / developers := List(
 )
 
 val Scala213 = "2.13.16"
-ThisBuild / crossScalaVersions := Seq(Scala213, "3.3.6")
+ThisBuild / crossScalaVersions := Seq("2.12.20", Scala213, "3.3.6")
 ThisBuild / scalaVersion := Scala213 // the default Scala
+
+ThisBuild / githubWorkflowJavaVersions --= List(JavaSpec.temurin("8"))
 ThisBuild / startYear := Some(2013)
 
-lazy val root = tlCrossRootProject.aggregate(servlet)
+lazy val root = tlCrossRootProject.aggregate(
+  servlet4,
+  servlet5,
+  servlet6,
+  examplesServlet4,
+  examplesServlet5,
+  examplesServlet6,
+)
 
 val asyncHttpClientVersion = "2.12.3"
+val jettyVersion = "12.0.22"
 val http4sVersion = "0.22.15"
-val jettyVersion = "9.4.46.v20220331"
-val servletVersion = "3.1.0"
+val munitCatsEffectVersion = "1.0.7"
+val servletApi6Version = "6.0.0"
+val servletApi5Version = "5.0.0"
+val servletApi4Version = "4.0.4"
+
+val catsEffectVersion = "2.5.5"
+val scalacheckVersion = "1.15.4"
+
+val scalacheckEffectVersion = "1.0.3"
+
+val Tomcat9Version = "9.0.106"
+val Tomcat10Version = "10.0.27"
+val Tomcat10_1Version = "10.1.42"
+
+lazy val servlet4 = project
+  .in(file("servlet4"))
+  .settings(
+    name := "http4s-servlet4",
+    description := "Portable servlet implementation for http4s servers",
+    tlJdkRelease := Some(11),
+    Test / fork := true,
+    libraryDependencies ++= Seq(
+      "jakarta.servlet" % "jakarta.servlet-api" % servletApi4Version % Provided,
+      "org.apache.tomcat.embed" % "tomcat-embed-core" % Tomcat9Version % Test,
+      "org.apache.tomcat.embed" % "tomcat-embed-websocket" % Tomcat9Version % Test,
+      "org.apache.tomcat" % "tomcat-catalina" % Tomcat9Version % Test,
+      "org.http4s" %% "http4s-dsl" % http4sVersion % Test,
+      "org.http4s" %% "http4s-server" % http4sVersion,
+      "org.typelevel" %% "munit-cats-effect-2" % munitCatsEffectVersion % Test,
+      "org.asynchttpclient" % "async-http-client" % asyncHttpClientVersion % Test,
+    ),
+  )
+  .dependsOn(testing % "test->test")
 
-lazy val servlet = project
-  .in(file("servlet"))
+lazy val servlet5 = project
+  .in(file("servlet5"))
   .settings(
+    name := "http4s-servlet5",
     description := "Portable servlet implementation for http4s servers",
+    tlJdkRelease := Some(11),
+    Test / fork := true,
     libraryDependencies ++= Seq(
+      "jakarta.servlet" % "jakarta.servlet-api" % servletApi6Version % Provided,
+      "org.apache.tomcat.embed" % "tomcat-embed-core" % Tomcat10Version % Test,
+      "org.apache.tomcat.embed" % "tomcat-embed-websocket" % Tomcat10Version % Test,
+      "org.apache.tomcat" % "tomcat-catalina" % Tomcat10Version % Test,
+      "org.http4s" %% "http4s-dsl" % http4sVersion % Test,
       "org.http4s" %% "http4s-server" % http4sVersion,
-      "javax.servlet" % "javax.servlet-api" % servletVersion % Provided,
+      "org.typelevel" %% "munit-cats-effect-2" % munitCatsEffectVersion % Test,
       "org.asynchttpclient" % "async-http-client" % asyncHttpClientVersion % Test,
-      "org.eclipse.jetty" % "jetty-server" % jettyVersion % Test,
-      "org.eclipse.jetty" % "jetty-servlet" % jettyVersion % Test,
+    ),
+  )
+  .dependsOn(testing % "test->test")
+
+lazy val servlet6 = project
+  .in(file("servlet6"))
+  .settings(
+    name := "http4s-servlet6",
+    description := "Portable servlet implementation for http4s servers",
+    tlJdkRelease := Some(11),
+    Test / fork := true,
+    libraryDependencies ++= Seq(
+      "jakarta.servlet" % "jakarta.servlet-api" % servletApi6Version % Provided,
+      "org.apache.tomcat.embed" % "tomcat-embed-core" % Tomcat10_1Version % Test,
+      "org.apache.tomcat.embed" % "tomcat-embed-websocket" % Tomcat10_1Version % Test,
+      "org.apache.tomcat" % "tomcat-catalina" % Tomcat10_1Version % Test,
       "org.http4s" %% "http4s-dsl" % http4sVersion % Test,
+      "org.http4s" %% "http4s-server" % http4sVersion,
+      "org.typelevel" %% "munit-cats-effect-2" % munitCatsEffectVersion % Test,
+      "org.asynchttpclient" % "async-http-client" % asyncHttpClientVersion % Test,
     ),
   )
   .dependsOn(testing % "test->test")
 
+lazy val examplesServlet4 = project
+  .in(file("examples-servlet4"))
+  .enablePlugins(NoPublishPlugin)
+  .enablePlugins(JettyPlugin)
+  .settings(
+    name := "http4s-servlet-examples-servlet4",
+    description := "Examples for http4s-servlet4",
+    startYear := Some(2013),
+    fork := true,
+    Jetty / containerLibs := List("org.eclipse.jetty.ee8" % "jetty-ee8-runner" % jettyVersion),
+    libraryDependencies ++= Seq(
+      "jakarta.servlet" % "jakarta.servlet-api" % servletApi4Version % Provided
+    ),
+  )
+  .dependsOn(servlet4)
+
+lazy val examplesServlet5 = project
+  .in(file("examples-servlet5"))
+  .enablePlugins(NoPublishPlugin)
+  .enablePlugins(JettyPlugin)
+  .settings(
+    name := "http4s-servlet-examples-servlet5",
+    description := "Examples for http4s-servlet5",
+    startYear := Some(2013),
+    fork := true,
+    Jetty / containerLibs := List("org.eclipse.jetty.ee9" % "jetty-ee9-runner" % jettyVersion),
+    libraryDependencies ++= Seq(
+      "jakarta.servlet" % "jakarta.servlet-api" % servletApi5Version % Provided
+    ),
+  )
+  .dependsOn(servlet5)
+
+lazy val examplesServlet6 = project
+  .in(file("examples-servlet6"))
+  .enablePlugins(NoPublishPlugin)
+  .enablePlugins(JettyPlugin)
+  .settings(
+    githubWorkflowJavaVersions --= List(JavaSpec.temurin("8")),
+    name := "http4s-servlet-examples-servlet6",
+    description := "Examples for http4s-servlet6",
+    startYear := Some(2013),
+    fork := true,
+    Jetty / containerLibs := List("org.eclipse.jetty.ee10" % "jetty-ee10-runner" % jettyVersion),
+    libraryDependencies ++= Seq(
+      "jakarta.servlet" % "jakarta.servlet-api" % servletApi6Version % Provided
+    ),
+  )
+  .dependsOn(servlet6)
+
 lazy val testing = project
   .in(file("testing"))
   .enablePlugins(NoPublishPlugin)
   .settings(
+    name := "http4s-testing",
+    description := "Internal utilities for http4s tests",
+    startYear := Some(2016),
     libraryDependencies ++= Seq(
       "org.http4s" %% "http4s-laws" % http4sVersion % Test
-    )
+    ),
   )