Skip to content

Commit eb12227

Browse files
authored
Merge pull request #61 from http4s/merge-0.23.17
Merge 0.23.17 -> 0.24
2 parents 182e418 + dbb5d19 commit eb12227

4 files changed

Lines changed: 26 additions & 26 deletions

File tree

.github/workflows/ci.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,21 @@ jobs:
4343
runs-on: ${{ matrix.os }}
4444
steps:
4545
- name: Checkout current branch (full)
46-
uses: actions/checkout@v2
46+
uses: actions/checkout@v3
4747
with:
4848
fetch-depth: 0
4949

5050
- name: Download Java (temurin@8)
5151
id: download-java-temurin-8
5252
if: matrix.java == 'temurin@8'
53-
uses: typelevel/download-java@v1
53+
uses: typelevel/download-java@v2
5454
with:
5555
distribution: temurin
5656
java-version: 8
5757

5858
- name: Setup Java (temurin@8)
5959
if: matrix.java == 'temurin@8'
60-
uses: actions/setup-java@v2
60+
uses: actions/setup-java@v3
6161
with:
6262
distribution: jdkfile
6363
java-version: 8
@@ -66,14 +66,14 @@ jobs:
6666
- name: Download Java (temurin@11)
6767
id: download-java-temurin-11
6868
if: matrix.java == 'temurin@11'
69-
uses: typelevel/download-java@v1
69+
uses: typelevel/download-java@v2
7070
with:
7171
distribution: temurin
7272
java-version: 11
7373

7474
- name: Setup Java (temurin@11)
7575
if: matrix.java == 'temurin@11'
76-
uses: actions/setup-java@v2
76+
uses: actions/setup-java@v3
7777
with:
7878
distribution: jdkfile
7979
java-version: 11
@@ -82,21 +82,21 @@ jobs:
8282
- name: Download Java (temurin@17)
8383
id: download-java-temurin-17
8484
if: matrix.java == 'temurin@17'
85-
uses: typelevel/download-java@v1
85+
uses: typelevel/download-java@v2
8686
with:
8787
distribution: temurin
8888
java-version: 17
8989

9090
- name: Setup Java (temurin@17)
9191
if: matrix.java == 'temurin@17'
92-
uses: actions/setup-java@v2
92+
uses: actions/setup-java@v3
9393
with:
9494
distribution: jdkfile
9595
java-version: 17
9696
jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}
9797

9898
- name: Cache sbt
99-
uses: actions/cache@v2
99+
uses: actions/cache@v3
100100
with:
101101
path: |
102102
~/.sbt
@@ -111,18 +111,18 @@ jobs:
111111
run: sbt githubWorkflowCheck
112112

113113
- name: Check headers and formatting
114-
if: matrix.java == 'temurin@8'
114+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
115115
run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
116116

117117
- name: Test
118118
run: sbt '++ ${{ matrix.scala }}' test
119119

120120
- name: Check binary compatibility
121-
if: matrix.java == 'temurin@8'
121+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
122122
run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues
123123

124124
- name: Generate API documentation
125-
if: matrix.java == 'temurin@8'
125+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
126126
run: sbt '++ ${{ matrix.scala }}' doc
127127

128128
- name: Check scalafix lints
@@ -143,7 +143,7 @@ jobs:
143143

144144
- name: Upload target directories
145145
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
146-
uses: actions/upload-artifact@v2
146+
uses: actions/upload-artifact@v3
147147
with:
148148
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
149149
path: targets.tar
@@ -160,21 +160,21 @@ jobs:
160160
runs-on: ${{ matrix.os }}
161161
steps:
162162
- name: Checkout current branch (full)
163-
uses: actions/checkout@v2
163+
uses: actions/checkout@v3
164164
with:
165165
fetch-depth: 0
166166

167167
- name: Download Java (temurin@8)
168168
id: download-java-temurin-8
169169
if: matrix.java == 'temurin@8'
170-
uses: typelevel/download-java@v1
170+
uses: typelevel/download-java@v2
171171
with:
172172
distribution: temurin
173173
java-version: 8
174174

175175
- name: Setup Java (temurin@8)
176176
if: matrix.java == 'temurin@8'
177-
uses: actions/setup-java@v2
177+
uses: actions/setup-java@v3
178178
with:
179179
distribution: jdkfile
180180
java-version: 8
@@ -183,14 +183,14 @@ jobs:
183183
- name: Download Java (temurin@11)
184184
id: download-java-temurin-11
185185
if: matrix.java == 'temurin@11'
186-
uses: typelevel/download-java@v1
186+
uses: typelevel/download-java@v2
187187
with:
188188
distribution: temurin
189189
java-version: 11
190190

191191
- name: Setup Java (temurin@11)
192192
if: matrix.java == 'temurin@11'
193-
uses: actions/setup-java@v2
193+
uses: actions/setup-java@v3
194194
with:
195195
distribution: jdkfile
196196
java-version: 11
@@ -199,21 +199,21 @@ jobs:
199199
- name: Download Java (temurin@17)
200200
id: download-java-temurin-17
201201
if: matrix.java == 'temurin@17'
202-
uses: typelevel/download-java@v1
202+
uses: typelevel/download-java@v2
203203
with:
204204
distribution: temurin
205205
java-version: 17
206206

207207
- name: Setup Java (temurin@17)
208208
if: matrix.java == 'temurin@17'
209-
uses: actions/setup-java@v2
209+
uses: actions/setup-java@v3
210210
with:
211211
distribution: jdkfile
212212
java-version: 17
213213
jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}
214214

215215
- name: Cache sbt
216-
uses: actions/cache@v2
216+
uses: actions/cache@v3
217217
with:
218218
path: |
219219
~/.sbt
@@ -225,7 +225,7 @@ jobs:
225225
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
226226

227227
- name: Download target directories (2.12.17)
228-
uses: actions/download-artifact@v2
228+
uses: actions/download-artifact@v3
229229
with:
230230
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17
231231

@@ -235,7 +235,7 @@ jobs:
235235
rm targets.tar
236236
237237
- name: Download target directories (2.13.10)
238-
uses: actions/download-artifact@v2
238+
uses: actions/download-artifact@v3
239239
with:
240240
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10
241241

@@ -245,7 +245,7 @@ jobs:
245245
rm targets.tar
246246
247247
- name: Download target directories (3.2.1)
248-
uses: actions/download-artifact@v2
248+
uses: actions/download-artifact@v3
249249
with:
250250
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1
251251

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ThisBuild / scalaVersion := Scala213
99

1010
lazy val root = project.in(file(".")).aggregate(twirl).enablePlugins(NoPublishPlugin)
1111

12-
val http4sVersion = "0.23.16"
12+
val http4sVersion = "0.23.17"
1313
val munitVersion = "0.7.29"
1414
val munitCatsEffectVersion = "2.0.0-M3"
1515

project/build.properties

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

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.9")
1+
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.10")
22
addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.0-M7")

0 commit comments

Comments
 (0)