Skip to content

Commit 97fdc1a

Browse files
ybasketyhefamly
authored andcommitted
Dependency updates
Bundles the open Scala Steward PRs into one that should pass CI without shenanigans.
1 parent 2d585f3 commit 97fdc1a

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
timeout-minutes: 60
4646
steps:
4747
- name: Checkout current branch (full)
48-
uses: actions/checkout@v5
48+
uses: actions/checkout@v6
4949
with:
5050
fetch-depth: 0
5151

@@ -122,7 +122,7 @@ jobs:
122122

123123
- name: Upload target directories
124124
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
125-
uses: actions/upload-artifact@v4
125+
uses: actions/upload-artifact@v5
126126
with:
127127
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
128128
path: targets.tar
@@ -138,7 +138,7 @@ jobs:
138138
runs-on: ${{ matrix.os }}
139139
steps:
140140
- name: Checkout current branch (full)
141-
uses: actions/checkout@v5
141+
uses: actions/checkout@v6
142142
with:
143143
fetch-depth: 0
144144

@@ -172,7 +172,7 @@ jobs:
172172
run: sbt +update
173173

174174
- name: Download target directories (2.12, rootJS)
175-
uses: actions/download-artifact@v4
175+
uses: actions/download-artifact@v6
176176
with:
177177
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS
178178

@@ -182,7 +182,7 @@ jobs:
182182
rm targets.tar
183183
184184
- name: Download target directories (2.12, rootJVM)
185-
uses: actions/download-artifact@v4
185+
uses: actions/download-artifact@v6
186186
with:
187187
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM
188188

@@ -192,7 +192,7 @@ jobs:
192192
rm targets.tar
193193
194194
- name: Download target directories (2.12, rootNative)
195-
uses: actions/download-artifact@v4
195+
uses: actions/download-artifact@v6
196196
with:
197197
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootNative
198198

@@ -202,7 +202,7 @@ jobs:
202202
rm targets.tar
203203
204204
- name: Download target directories (2.13, rootJS)
205-
uses: actions/download-artifact@v4
205+
uses: actions/download-artifact@v6
206206
with:
207207
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS
208208

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

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

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

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

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

@@ -295,7 +295,7 @@ jobs:
295295
runs-on: ${{ matrix.os }}
296296
steps:
297297
- name: Checkout current branch (full)
298-
uses: actions/checkout@v5
298+
uses: actions/checkout@v6
299299
with:
300300
fetch-depth: 0
301301

@@ -343,7 +343,7 @@ jobs:
343343
runs-on: ${{ matrix.os }}
344344
steps:
345345
- name: Checkout current branch (full)
346-
uses: actions/checkout@v5
346+
uses: actions/checkout@v6
347347
with:
348348
fetch-depth: 0
349349

build.sbt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ ThisBuild / developers := List(
99
ThisBuild / homepage := Some(url("https://github.com/http4s/http4s-fs2-data"))
1010
ThisBuild / licenses := List(License.Apache2)
1111

12-
val Scala213 = "2.13.16"
13-
ThisBuild / crossScalaVersions := Seq("2.12.20", Scala213, "3.3.6")
12+
val Scala213 = "2.13.18"
13+
ThisBuild / crossScalaVersions := Seq("2.12.21", Scala213, "3.3.7")
1414
ThisBuild / scalaVersion := Scala213
1515

1616
// ensure missing timezones don't break tests on JS
@@ -29,10 +29,10 @@ lazy val root =
2929
.disablePlugins(HeaderPlugin)
3030
.settings(libraryDependencies := Nil)
3131

32-
val http4sVersion = "0.23.30"
32+
val http4sVersion = "0.23.33"
3333
val scalaXmlVersion = "2.2.0"
34-
val fs2Version = "3.12.0"
35-
val fs2DataVersion = "1.11.3"
34+
val fs2Version = "3.13.0"
35+
val fs2DataVersion = "1.12.1"
3636
val munitVersion = "1.0.0-M11"
3737
val munitCatsEffectVersion = "2.1.0"
3838

@@ -129,7 +129,7 @@ lazy val docs = project
129129
.dependsOn(xml.jvm, xmlScala.jvm, csv.jvm, cbor.jvm, json.jvm)
130130
.settings(
131131
libraryDependencies ++= Seq(
132-
"io.circe" %%% "circe-generic" % "0.14.5",
132+
"io.circe" %%% "circe-generic" % "0.14.15",
133133
"org.http4s" %%% "http4s-dsl" % http4sVersion,
134134
"org.http4s" %%% "http4s-circe" % http4sVersion,
135135
"org.gnieh" %%% "fs2-data-csv-generic" % fs2DataVersion,

project/build.properties

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

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.1")
1+
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.5")
22

3-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2")
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
44

55
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
66

0 commit comments

Comments
 (0)