Skip to content

Commit 4ff83cc

Browse files
authored
Merge branch 'series/0.24' into update/series/0.24/jetty-ee8-runner-12.0.37
2 parents b9211b3 + 1f76155 commit 4ff83cc

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -310,19 +310,19 @@ jobs:
310310
strategy:
311311
matrix:
312312
os: [ubuntu-22.04]
313-
java: [temurin@11]
313+
java: [temurin@17]
314314
runs-on: ${{ matrix.os }}
315315
steps:
316316
- name: Checkout current branch (fast)
317317
uses: actions/checkout@v6
318318

319-
- name: Setup Java (temurin@11)
320-
id: setup-java-temurin-11
321-
if: matrix.java == 'temurin@11'
319+
- name: Setup Java (temurin@17)
320+
id: setup-java-temurin-17
321+
if: matrix.java == 'temurin@17'
322322
uses: actions/setup-java@v5
323323
with:
324324
distribution: temurin
325-
java-version: 11
325+
java-version: 17
326326

327327
- uses: coursier/setup-action@v1
328328
with:

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ lazy val root = tlCrossRootProject.aggregate(servlet, examples)
2323

2424
val asyncHttpClientVersion = "2.16.0"
2525
val jettyVersion = "12.0.37"
26-
val http4sVersion = "0.23.34"
26+
val http4sVersion = "0.23.36"
2727
val munitCatsEffectVersion = "2.2.0"
2828
val servletApiVersion = "4.0.4"
2929
val undertowVersion = "2.2.40.Final"

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.2.5")
2-
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.6")
2+
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.7")

0 commit comments

Comments
 (0)