diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index a80bd90..8af945f 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.8.5 11cd2cbc2cdb9c7f1cf139d1fde17db02f23ddda + +# Scala Steward: Reformat with scalafmt 3.9.10 +e20c6084b1b4ac476b433ba3f2fb8064c02911fb diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 460fac5..6876ad3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -139,7 +139,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 @@ -202,7 +202,7 @@ jobs: run: sbt +update - name: Download target directories (2.13, http4s-sessionJS) - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-http4s-sessionJS @@ -212,7 +212,7 @@ jobs: rm targets.tar - name: Download target directories (2.13, http4s-sessionNative) - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-http4s-sessionNative @@ -222,7 +222,7 @@ jobs: rm targets.tar - name: Download target directories (2.13, http4s-sessionJVM) - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-http4s-sessionJVM @@ -232,7 +232,7 @@ jobs: rm targets.tar - name: Download target directories (3, http4s-sessionJS) - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: target-${{ matrix.os }}-${{ matrix.java }}-3-http4s-sessionJS @@ -242,7 +242,7 @@ jobs: rm targets.tar - name: Download target directories (3, http4s-sessionNative) - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: target-${{ matrix.os }}-${{ matrix.java }}-3-http4s-sessionNative @@ -252,7 +252,7 @@ jobs: rm targets.tar - name: Download target directories (3, http4s-sessionJVM) - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: target-${{ matrix.os }}-${{ matrix.java }}-3-http4s-sessionJVM diff --git a/.scalafmt.conf b/.scalafmt.conf index 963ed24..b81ec11 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.9.4 +version = 3.9.10 align.openParenCallSite = true align.openParenDefnSite = true maxColumn = 120 diff --git a/build.sbt b/build.sbt index 061c988..650ba8d 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ val Scala213Cond = s"matrix.scala == '$Scala213'" val catsV = "2.13.0" val catsEffectV = "3.6.3" val fs2V = "3.6.1" -val http4sV = "0.23.32" +val http4sV = "0.23.33" val munitCatsEffectV = "2.1.0" // Projects diff --git a/core/src/main/scala/org/http4s/session/SessionMiddleware.scala b/core/src/main/scala/org/http4s/session/SessionMiddleware.scala index 75125ca..7d648ed 100644 --- a/core/src/main/scala/org/http4s/session/SessionMiddleware.scala +++ b/core/src/main/scala/org/http4s/session/SessionMiddleware.scala @@ -98,7 +98,7 @@ object SessionMiddleware { sessionOpt <- OptionT.liftF(session) response <- sessionApp(ContextRequest(sessionOpt, req)) out <- OptionT.liftF((sessionId, response.context) match { - case (None, None) => response.response.pure[F] + case (None, None) => response.response.pure[F] case (Some(id), Some(context)) => sessionStore.modifySession( id, diff --git a/project/build.properties b/project/build.properties index c101b1b..7be0212 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.6 \ No newline at end of file +sbt.version=1.11.7 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index b47c91f..c2da31a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.1") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2") +addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.3") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")