Skip to content

Commit 343108a

Browse files
authored
Merge pull request #265 from http4s/scala-bumps
Scala 2.13.18, 2.12.21; sbt-http4s-org 2.0.5
2 parents b4e6566 + 380b0de commit 343108a

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/ci.yml

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

@@ -126,7 +126,7 @@ jobs:
126126

127127
- name: Upload target directories
128128
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
129-
uses: actions/upload-artifact@v4
129+
uses: actions/upload-artifact@v5
130130
with:
131131
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
132132
path: targets.tar
@@ -142,7 +142,7 @@ jobs:
142142
runs-on: ${{ matrix.os }}
143143
steps:
144144
- name: Checkout current branch (full)
145-
uses: actions/checkout@v5
145+
uses: actions/checkout@v6
146146
with:
147147
fetch-depth: 0
148148

@@ -189,7 +189,7 @@ jobs:
189189
run: sbt +update
190190

191191
- name: Download target directories (2.12)
192-
uses: actions/download-artifact@v4
192+
uses: actions/download-artifact@v6
193193
with:
194194
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12
195195

@@ -199,7 +199,7 @@ jobs:
199199
rm targets.tar
200200
201201
- name: Download target directories (2.13)
202-
uses: actions/download-artifact@v4
202+
uses: actions/download-artifact@v6
203203
with:
204204
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13
205205

@@ -209,7 +209,7 @@ jobs:
209209
rm targets.tar
210210
211211
- name: Download target directories (3)
212-
uses: actions/download-artifact@v4
212+
uses: actions/download-artifact@v6
213213
with:
214214
name: target-${{ matrix.os }}-${{ matrix.java }}-3
215215

@@ -252,7 +252,7 @@ jobs:
252252
runs-on: ${{ matrix.os }}
253253
steps:
254254
- name: Checkout current branch (full)
255-
uses: actions/checkout@v5
255+
uses: actions/checkout@v6
256256
with:
257257
fetch-depth: 0
258258

@@ -313,7 +313,7 @@ jobs:
313313
runs-on: ${{ matrix.os }}
314314
steps:
315315
- name: Checkout current branch (full)
316-
uses: actions/checkout@v5
316+
uses: actions/checkout@v6
317317
with:
318318
fetch-depth: 0
319319

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ ThisBuild / developers := List(
33
tlGitHubDev("rossabaker", "Ross A. Baker")
44
)
55

6-
val Scala213 = "2.13.16"
7-
ThisBuild / crossScalaVersions := Seq("2.12.20", Scala213, "3.3.7")
6+
val Scala213 = "2.13.18"
7+
ThisBuild / crossScalaVersions := Seq("2.12.21", Scala213, "3.3.7")
88
ThisBuild / scalaVersion := Scala213
99
ThisBuild / startYear := Some(2018)
1010

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.2")
1+
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.5")

0 commit comments

Comments
 (0)