Skip to content

Update sbt-http4s-org to 2.0.3 #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danicheg merged 15 commits into from
Nov 29, 2025
Merged

Update sbt-http4s-org to 2.0.3 #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
96dd330
Update sbt, scripted-plugin to 1.11.7
http4s-steward[bot] Oct 5, 2025
11451b1
Merge pull request #308 from http4s/update/sbt-1.11.7
danicheg Oct 11, 2025
6a21c10
Update sbt-http4s-org to 2.0.2
http4s-steward[bot] Oct 11, 2025
7f34777
Merge pull request #310 from http4s/update/sbt-http4s-org-2.0.2
danicheg Oct 12, 2025
a979ffd
Update http4s-core, ... to 0.23.33
http4s-steward[bot] Nov 25, 2025
b11cc43
Update sbt-scalajs, scalajs-compiler, ... to 1.20.1
http4s-steward[bot] Nov 25, 2025
b47bce9
Update scalafmt-core to 3.9.10
http4s-steward[bot] Nov 25, 2025
e20c608
Reformat with scalafmt 3.9.10
http4s-steward[bot] Nov 25, 2025
5d5e75c
Add 'Reformat with scalafmt 3.9.10' to .git-blame-ignore-revs
http4s-steward[bot] Nov 25, 2025
7e66ff2
Update sbt-http4s-org to 2.0.3
http4s-steward[bot] Nov 25, 2025
5fec5e6
Run prePR with sbt-typelevel
http4s-steward[bot] Nov 25, 2025
72df851
Merge pull request #311 from http4s/update/http4s-core-0.23.33
danicheg Nov 29, 2025
557b345
Merge pull request #312 from http4s/update/sbt-scalajs-1.20.1
danicheg Nov 29, 2025
2985db4
Merge pull request #316 from http4s/update/scalafmt-core-3.9.10
danicheg Nov 29, 2025
d63d2e2
Merge branch 'main' into update/sbt-http4s-org-2.0.3
danicheg Nov 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.8.5
11cd2cbc2cdb9c7f1cf139d1fde17db02f23ddda

# Scala Steward: Reformat with scalafmt 3.9.10
e20c6084b1b4ac476b433ba3f2fb8064c02911fb
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.9.4
version = 3.9.10
align.openParenCallSite = true
align.openParenDefnSite = true
maxColumn = 120
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/org/http4s/session/SessionMiddleware.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.11.6
sbt.version=1.11.7
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Loading