Skip to content

Commit

Permalink
Merge branch 'series/0.24' into merge-0.23.13
Browse files Browse the repository at this point in the history
  • Loading branch information
rossabaker committed Jun 4, 2024
2 parents 7f4331a + 83ff782 commit d786f61
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
scala: [2.13.8, 2.12.17, 3.3.0]
scala: [2.13.11, 2.12.19, 3.3.0]
java: [temurin@11, temurin@17]
exclude:
- scala: 2.12.17
- scala: 2.12.19
java: temurin@17
- scala: 3.3.0
java: temurin@17
Expand Down Expand Up @@ -187,22 +187,22 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (2.13.8)
- name: Download target directories (2.13.11)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11

- name: Inflate target directories (2.13.8)
- name: Inflate target directories (2.13.11)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.12.17)
- name: Download target directories (2.12.19)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.19

- name: Inflate target directories (2.12.17)
- name: Inflate target directories (2.12.19)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.7.12
version = 3.7.17

style = default

Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ ThisBuild / developers := List(
// publish website from this branch
ThisBuild / tlSitePublishBranch := Some("main")

val Scala213 = "2.13.8"
ThisBuild / crossScalaVersions := Seq(Scala213, "2.12.17", "3.3.0")
val Scala213 = "2.13.11"
ThisBuild / crossScalaVersions := Seq(Scala213, "2.12.19", "3.3.0")
ThisBuild / scalaVersion := Scala213 // the default Scala
ThisBuild / githubWorkflowJavaVersions ~= {
// Jetty 10 bumps the requirement to Java 11
Expand All @@ -28,7 +28,7 @@ lazy val root = project
.aggregate(jettyServer, jettyClient)

val jettyVersion = "10.0.15"
val http4sVersion = "0.23.25"
val http4sVersion = "0.23.27"
val http4sServletVersion = "0.24.0-RC1"
val munitCatsEffectVersion = "1.0.7"
val slf4jVersion = "1.7.25"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.3
sbt.version=1.9.9

0 comments on commit d786f61

Please sign in to comment.