Skip to content

Commit feb39ef

Browse files
authored
Merge branch 'main' into update/sbt-scalajs-1.15.0
2 parents 75661aa + ab514b4 commit feb39ef

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/workflows/ci.yml

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

137137
- name: Upload target directories
138138
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
139-
uses: actions/upload-artifact@v3
139+
uses: actions/upload-artifact@v4
140140
with:
141141
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
142142
path: targets.tar
@@ -196,7 +196,7 @@ jobs:
196196
run: sbt +update
197197

198198
- name: Download target directories (2.13, http4s-sessionJS)
199-
uses: actions/download-artifact@v3
199+
uses: actions/download-artifact@v4
200200
with:
201201
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-http4s-sessionJS
202202

@@ -206,7 +206,7 @@ jobs:
206206
rm targets.tar
207207
208208
- name: Download target directories (2.13, http4s-sessionNative)
209-
uses: actions/download-artifact@v3
209+
uses: actions/download-artifact@v4
210210
with:
211211
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-http4s-sessionNative
212212

@@ -216,7 +216,7 @@ jobs:
216216
rm targets.tar
217217
218218
- name: Download target directories (2.13, http4s-sessionJVM)
219-
uses: actions/download-artifact@v3
219+
uses: actions/download-artifact@v4
220220
with:
221221
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-http4s-sessionJVM
222222

@@ -226,7 +226,7 @@ jobs:
226226
rm targets.tar
227227
228228
- name: Download target directories (3, http4s-sessionJS)
229-
uses: actions/download-artifact@v3
229+
uses: actions/download-artifact@v4
230230
with:
231231
name: target-${{ matrix.os }}-${{ matrix.java }}-3-http4s-sessionJS
232232

@@ -236,7 +236,7 @@ jobs:
236236
rm targets.tar
237237
238238
- name: Download target directories (3, http4s-sessionNative)
239-
uses: actions/download-artifact@v3
239+
uses: actions/download-artifact@v4
240240
with:
241241
name: target-${{ matrix.os }}-${{ matrix.java }}-3-http4s-sessionNative
242242

@@ -246,7 +246,7 @@ jobs:
246246
rm targets.tar
247247
248248
- name: Download target directories (3, http4s-sessionJVM)
249-
uses: actions/download-artifact@v3
249+
uses: actions/download-artifact@v4
250250
with:
251251
name: target-${{ matrix.os }}-${{ matrix.java }}-3-http4s-sessionJVM
252252

.scalafmt.conf

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

project/build.properties

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

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.16.2")
1+
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.16.3")
22
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
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)