Skip to content

Commit e3e64f8

Browse files
Update sbt-http4s-org to 2.0.3 (#317)
1 parent 7f03e05 commit e3e64f8

File tree

7 files changed

+16
-13
lines changed

7 files changed

+16
-13
lines changed

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
# Scala Steward: Reformat with scalafmt 3.8.5
22
11cd2cbc2cdb9c7f1cf139d1fde17db02f23ddda
3+
4+
# Scala Steward: Reformat with scalafmt 3.9.10
5+
e20c6084b1b4ac476b433ba3f2fb8064c02911fb

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139

140140
- name: Upload target directories
141141
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
142-
uses: actions/upload-artifact@v4
142+
uses: actions/upload-artifact@v5
143143
with:
144144
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
145145
path: targets.tar
@@ -202,7 +202,7 @@ jobs:
202202
run: sbt +update
203203

204204
- name: Download target directories (2.13, http4s-sessionJS)
205-
uses: actions/download-artifact@v4
205+
uses: actions/download-artifact@v6
206206
with:
207207
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-http4s-sessionJS
208208

@@ -212,7 +212,7 @@ jobs:
212212
rm targets.tar
213213
214214
- name: Download target directories (2.13, http4s-sessionNative)
215-
uses: actions/download-artifact@v4
215+
uses: actions/download-artifact@v6
216216
with:
217217
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-http4s-sessionNative
218218

@@ -222,7 +222,7 @@ jobs:
222222
rm targets.tar
223223
224224
- name: Download target directories (2.13, http4s-sessionJVM)
225-
uses: actions/download-artifact@v4
225+
uses: actions/download-artifact@v6
226226
with:
227227
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-http4s-sessionJVM
228228

@@ -232,7 +232,7 @@ jobs:
232232
rm targets.tar
233233
234234
- name: Download target directories (3, http4s-sessionJS)
235-
uses: actions/download-artifact@v4
235+
uses: actions/download-artifact@v6
236236
with:
237237
name: target-${{ matrix.os }}-${{ matrix.java }}-3-http4s-sessionJS
238238

@@ -242,7 +242,7 @@ jobs:
242242
rm targets.tar
243243
244244
- name: Download target directories (3, http4s-sessionNative)
245-
uses: actions/download-artifact@v4
245+
uses: actions/download-artifact@v6
246246
with:
247247
name: target-${{ matrix.os }}-${{ matrix.java }}-3-http4s-sessionNative
248248

@@ -252,7 +252,7 @@ jobs:
252252
rm targets.tar
253253
254254
- name: Download target directories (3, http4s-sessionJVM)
255-
uses: actions/download-artifact@v4
255+
uses: actions/download-artifact@v6
256256
with:
257257
name: target-${{ matrix.os }}-${{ matrix.java }}-3-http4s-sessionJVM
258258

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.9.4
1+
version = 3.9.10
22
align.openParenCallSite = true
33
align.openParenDefnSite = true
44
maxColumn = 120

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ val Scala213Cond = s"matrix.scala == '$Scala213'"
2121
val catsV = "2.13.0"
2222
val catsEffectV = "3.6.3"
2323
val fs2V = "3.6.1"
24-
val http4sV = "0.23.32"
24+
val http4sV = "0.23.33"
2525
val munitCatsEffectV = "2.1.0"
2626

2727
// Projects

core/src/main/scala/org/http4s/session/SessionMiddleware.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ object SessionMiddleware {
9898
sessionOpt <- OptionT.liftF(session)
9999
response <- sessionApp(ContextRequest(sessionOpt, req))
100100
out <- OptionT.liftF((sessionId, response.context) match {
101-
case (None, None) => response.response.pure[F]
101+
case (None, None) => response.response.pure[F]
102102
case (Some(id), Some(context)) =>
103103
sessionStore.modifySession(
104104
id,

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.6
1+
sbt.version=1.11.7

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.1")
2-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2")
1+
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.3")
2+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
33
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
44
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")

0 commit comments

Comments
 (0)