Skip to content

Commit 69d8ca0

Browse files
authored
Merge branch 'series/0.24' into update/series/0.24/jetty-server-10.0.21
2 parents e57d0a3 + df85cc8 commit 69d8ca0

File tree

5 files changed

+41
-36
lines changed

5 files changed

+41
-36
lines changed

.github/workflows/ci.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
os: [ubuntu-latest]
32-
scala: [2.12.18, 2.13.11, 3.3.0]
32+
scala: [2.12.19, 2.13.11, 3.3.0]
3333
java: [temurin@11, temurin@17]
3434
project: [rootJVM]
3535
exclude:
36-
- scala: 2.12.18
36+
- scala: 2.12.19
3737
java: temurin@17
3838
- scala: 3.3.0
3939
java: temurin@17
@@ -188,12 +188,12 @@ jobs:
188188
~/Library/Caches/Coursier/v1
189189
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
190190

191-
- name: Download target directories (2.12.18, rootJVM)
191+
- name: Download target directories (2.12.19, rootJVM)
192192
uses: actions/download-artifact@v3
193193
with:
194-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJVM
194+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.19-rootJVM
195195

196-
- name: Inflate target directories (2.12.18, rootJVM)
196+
- name: Inflate target directories (2.12.19, rootJVM)
197197
run: |
198198
tar xf targets.tar
199199
rm targets.tar

.scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.7.12
1+
version = 3.7.17
22

33
style = default
44

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ThisBuild / developers := List(
1111
ThisBuild / tlSitePublishBranch := Some("main")
1212

1313
val Scala213 = "2.13.11"
14-
ThisBuild / crossScalaVersions := Seq("2.12.18", Scala213, "3.3.0")
14+
ThisBuild / crossScalaVersions := Seq("2.12.19", Scala213, "3.3.0")
1515
ThisBuild / scalaVersion := Scala213 // the default Scala
1616

1717
// Jetty 10+, for testing, requires Java 11.
@@ -22,7 +22,7 @@ lazy val root = tlCrossRootProject.aggregate(servlet, examples)
2222

2323
val asyncHttpClientVersion = "2.12.3"
2424
val jettyVersion = "10.0.21"
25-
val http4sVersion = "0.23.26"
25+
val http4sVersion = "0.23.27"
2626
val munitCatsEffectVersion = "1.0.7"
2727
val servletApiVersion = "4.0.1"
2828

flake.lock

+32-27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.2
1+
sbt.version=1.9.9

0 commit comments

Comments
 (0)