Merge pull request #1134 from http4s/merge-to-main

Merge to main

.github/workflows/ci.yml

@@ -37,6 +37,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:
@@ -119,6 +122,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:
@@ -196,13 +202,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:
@@ -273,6 +282,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:
@@ -309,7 +321,7 @@ jobs:
 
       - name: Publish site
         if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
-        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

.scalafmt.conf

@@ -1,4 +1,4 @@
-version=3.8.0
+version=3.8.3
 
 runner.dialect = scala213
 style = default

build.sbt

@@ -34,18 +34,18 @@ ThisBuild / mergifyStewardConfig := Some(
 ThisBuild / mergifyRequiredJobs += "site"
 ThisBuild / mergifyLabelPaths += "docs" -> file("docs")
 
-val catsV = "2.10.0"
-val catsEffectV = "3.5.3"
-val fs2V = "3.9.4"
-val scodecV = "1.1.38"
-val http4sV = "1.0.0-M40"
+val catsV = "2.12.0"
+val catsEffectV = "3.5.5"
+val fs2V = "3.11.0"
+val scodecV = "1.2.1"
+val http4sV = "1.0.0-M43"
 val log4catsV = "2.7.0"
 val reactiveStreamsV = "1.0.4"
-val vaultV = "3.5.0"
-val caseInsensitiveV = "1.4.0"
+val vaultV = "3.6.0"
+val caseInsensitiveV = "1.4.2"
 
-val munitV = "1.0.0-M11"
-val munitCatsEffectV = "2.0.0-M4"
+val munitV = "1.0.2"
+val munitCatsEffectV = "2.0.0"
 
 val emberServer = Seq(
   "org.http4s" %% "http4s-ember-server" % http4sV,
@@ -70,8 +70,8 @@ val coreDeps = Seq(
   "org.typelevel" %% "munit-cats-effect" % munitCatsEffectV
 )).map(_ % Test)
 
-val scala213 = "2.13.12"
-ThisBuild / crossScalaVersions := Seq(scala213, "3.3.3")
+val scala213 = "2.13.15"
+ThisBuild / crossScalaVersions := Seq(scala213, "3.3.4")
 ThisBuild / scalaVersion := scala213
 ThisBuild / tlBaseVersion := "1.0"
 ThisBuild / startYear := Some(2019)

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 {

core/src/test/scala/org/http4s/jdkhttpclient/BodyLeakExample.scala

@@ -31,7 +31,7 @@ import org.typelevel.log4cats.noop.NoOpFactory
 // Run e.g. with `bloop run core-test --args -J-Xmx200M`
 object BodyLeakExample extends IOApp {
 
-  implicit val loggerFactor: LoggerFactory[IO] = NoOpFactory[IO]
+  implicit val loggerFactory: LoggerFactory[IO] = NoOpFactory[IO]
 
   val app: HttpApp[IO] =
     Kleisli((_: Request[IO]) => IO.pure(Response[IO]().withEntity("Hello, HTTP")))

core/src/test/scala/org/http4s/jdkhttpclient/CompletableFutureTerminationTest.scala

@@ -40,7 +40,7 @@ import scala.concurrent.duration._
 final class CompletableFutureTerminationTest extends CatsEffectSuite {
   import CompletableFutureTerminationTest._
 
-  implicit val loggerFactor: LoggerFactory[IO] = NoOpFactory[IO]
+  implicit val loggerFactory: LoggerFactory[IO] = NoOpFactory[IO]
 
   private val duration: FiniteDuration =
     FiniteDuration(50L, TimeUnit.MILLISECONDS)

core/src/test/scala/org/http4s/jdkhttpclient/JdkWSClientSpec.scala

@@ -37,7 +37,7 @@ import scala.concurrent.duration._
 
 class JdkWSClientSpec extends CatsEffectSuite {
 
-  implicit val loggerFactor: LoggerFactory[IO] = NoOpFactory[IO]
+  implicit val loggerFactory: LoggerFactory[IO] = NoOpFactory[IO]
 
   val webSocket: IOFixture[WSClient[IO]] =
     ResourceSuiteLocalFixture("webSocket", Resource.eval(JdkWSClient.simple[IO]))

docs/README.md

@@ -192,7 +192,7 @@ import com.comcast.ip4s._
 import org.typelevel.log4cats.LoggerFactory
 import org.typelevel.log4cats.noop.NoOpFactory
 
-implicit val loggerFactor: LoggerFactory[IO] = NoOpFactory[IO]
+implicit val loggerFactory: LoggerFactory[IO] = NoOpFactory[IO]
 
 val echoServer = EmberServerBuilder.default[IO]
   .withPort(port"0")

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")