Skip to content

Commit 4c36543

Browse files
authored
Merge pull request #527 from http4s/scala-bumps
2 parents d60be74 + 01b3742 commit 4c36543

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
timeout-minutes: 60
3636
steps:
3737
- name: Checkout current branch (full)
38-
uses: actions/checkout@v5
38+
uses: actions/checkout@v6
3939
with:
4040
fetch-depth: 0
4141

@@ -91,7 +91,7 @@ jobs:
9191

9292
- name: Upload target directories
9393
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
94-
uses: actions/upload-artifact@v4
94+
uses: actions/upload-artifact@v5
9595
with:
9696
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
9797
path: targets.tar
@@ -107,7 +107,7 @@ jobs:
107107
runs-on: ${{ matrix.os }}
108108
steps:
109109
- name: Checkout current branch (full)
110-
uses: actions/checkout@v5
110+
uses: actions/checkout@v6
111111
with:
112112
fetch-depth: 0
113113

@@ -128,7 +128,7 @@ jobs:
128128
run: sbt +update
129129

130130
- name: Download target directories (2.13)
131-
uses: actions/download-artifact@v4
131+
uses: actions/download-artifact@v6
132132
with:
133133
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13
134134

@@ -138,7 +138,7 @@ jobs:
138138
rm targets.tar
139139
140140
- name: Download target directories (2.12)
141-
uses: actions/download-artifact@v4
141+
uses: actions/download-artifact@v6
142142
with:
143143
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12
144144

@@ -148,7 +148,7 @@ jobs:
148148
rm targets.tar
149149
150150
- name: Download target directories (3)
151-
uses: actions/download-artifact@v4
151+
uses: actions/download-artifact@v6
152152
with:
153153
name: target-${{ matrix.os }}-${{ matrix.java }}-3
154154

@@ -191,7 +191,7 @@ jobs:
191191
runs-on: ${{ matrix.os }}
192192
steps:
193193
- name: Checkout current branch (full)
194-
uses: actions/checkout@v5
194+
uses: actions/checkout@v6
195195
with:
196196
fetch-depth: 0
197197

@@ -226,7 +226,7 @@ jobs:
226226
runs-on: ${{ matrix.os }}
227227
steps:
228228
- name: Checkout current branch (full)
229-
uses: actions/checkout@v5
229+
uses: actions/checkout@v6
230230
with:
231231
fetch-depth: 0
232232

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ThisBuild / startYear := Some(2014)
1212
// publish website from this branch
1313
ThisBuild / tlSitePublishBranch := Some("main")
1414

15-
val Scala213 = "2.13.16"
16-
ThisBuild / crossScalaVersions := Seq(Scala213, "2.12.20", "3.3.7")
15+
val Scala213 = "2.13.18"
16+
ThisBuild / crossScalaVersions := Seq(Scala213, "2.12.21", "3.3.7")
1717
ThisBuild / scalaVersion := Scala213 // the default Scala
1818
ThisBuild / tlJdkRelease := Some(17)
1919
ThisBuild / githubWorkflowJavaVersions ~= {

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)