Merge branch 'series/0.9' into update/series/0.9/scala-library-2.12.20

.github/workflows/ci.yml

@@ -39,6 +39,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
+      - name: Install sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
@@ -121,6 +124,9 @@ jobs:
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
@@ -208,13 +214,16 @@ jobs:
 
   dependency-submission:
     name: Submit Dependencies
-    if: github.event_name != 'pull_request'
+    if: github.event.repository.fork == false && github.event_name != 'pull_request'
     strategy:
       matrix:
         os: [ubuntu-latest]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
@@ -260,6 +269,9 @@ jobs:
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
@@ -296,7 +308,7 @@ jobs:
 
       - name: Publish site
         if: github.event_name != 'pull_request' && github.ref == 'refs/heads/series/0.9'
-        uses: peaceiris/actions-gh-pages@v3.9.3
+        uses: peaceiris/actions-gh-pages@v4.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: site/target/docs/site

build.sbt

@@ -34,16 +34,16 @@ ThisBuild / mergifyStewardConfig := Some(
 ThisBuild / mergifyRequiredJobs += "site"
 ThisBuild / mergifyLabelPaths += "docs" -> file("docs")
 
-val catsV = "2.10.0"
-val catsEffectV = "3.5.4"
+val catsV = "2.12.0"
+val catsEffectV = "3.5.5"
 val fs2V = "3.9.4"
-val scodecV = "1.1.38"
+val scodecV = "1.2.1"
 val http4sV = "0.23.26"
 val reactiveStreamsV = "1.0.4"
 val vaultV = "3.5.0"
 val caseInsensitiveV = "1.4.0"
 
-val munitV = "1.0.0-M11"
+val munitV = "1.0.2"
 val munitCatsEffectV = "2.0.0-M4"
 
 val emberServer = Seq(
@@ -68,7 +68,7 @@ val coreDeps = Seq(
   "org.typelevel" %% "munit-cats-effect" % munitCatsEffectV
 )).map(_ % Test)
 
-val scala213 = "2.13.12"
+val scala213 = "2.13.15"
 ThisBuild / crossScalaVersions := Seq("2.12.20", scala213, "3.3.4")
 ThisBuild / scalaVersion := scala213
 ThisBuild / tlBaseVersion := "0.9"

core/src/main/scala/org/http4s/jdkhttpclient/JdkWSClient.scala

@@ -122,7 +122,7 @@ object JdkWSClient {
                       errs <- Stream
                         .repeatEval(queue.tryTake)
                         .unNoneTerminate
-                        .collect { case Left(e) => e }
+                        .collect { case Left(t) => t }
                         .compile
                         .toList
                       _ <- F.raiseError[Unit](CompositeFailure.fromList(errs) match {

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.10.5

project/plugins.sbt

@@ -1,2 +1,2 @@
-addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.16.3")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.6.7")
+addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.17.5")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.4")