Merge pull request #452 from http4s/scala-2.13.18

Author: rossabaker

.github/workflows/ci.yml

@@ -127,7 +127,7 @@ jobs:
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
           path: targets.tar
@@ -190,7 +190,7 @@ jobs:
         run: sbt +update
 
       - name: Download target directories (2.12, rootJVM)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM
 
@@ -200,7 +200,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13, rootJVM)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM
 
@@ -210,7 +210,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (3, rootJVM)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM
 

build.sbt

@@ -10,7 +10,7 @@ ThisBuild / developers := List(
 // publish website from this branch
 ThisBuild / tlSitePublishBranch := Some("main")
 
-val Scala213 = "2.13.16"
+val Scala213 = "2.13.18"
 ThisBuild / crossScalaVersions := Seq("2.12.20", Scala213, "3.3.7")
 ThisBuild / scalaVersion := Scala213 // the default Scala
 
@@ -58,8 +58,6 @@ lazy val servletTesting = project
   .settings(
     name := "http4s-servlet-testing",
     description := "Portable servlet implementation for http4s servers",
-    // Jetty 12+ for testing, requires Java 17 or higher.
-    githubWorkflowJavaVersions --= Seq(JavaSpec.temurin("8"), JavaSpec.temurin("11")),
     Test / fork := true,
     libraryDependencies ++= Seq(
       "org.eclipse.jetty" % "jetty-client" % jettyVersion % Test,
@@ -78,8 +76,6 @@ lazy val examples = project
   .settings(
     name := "http4s-servlet-examples",
     description := "Examples for http4s-servlet",
-    // Jetty 12+ for testing, requires Java 17 or higher.
-    githubWorkflowJavaVersions --= Seq(JavaSpec.temurin("8"), JavaSpec.temurin("11")),
     startYear := Some(2013),
     fork := true,
     Jetty / containerLibs := List("org.eclipse.jetty.ee8" % "jetty-ee8-runner" % jettyVersion),

project/plugins.sbt

@@ -1,2 +1,2 @@
 addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.2.5")
-addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.2")
+addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.3")