Skip to content

Commit

Permalink
Merge branch 'series/0.24' into update/series/0.24/scala3-library-3.3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
rossabaker authored Jun 6, 2024
2 parents 91f6081 + 1b311f3 commit ab722e9
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 36 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
scala: [2.12.18, 2.13.11, 3.3.3]
scala: [2.12.19, 2.13.11, 3.3.3]
java: [temurin@11, temurin@17]
project: [rootJVM]
exclude:
- scala: 2.12.18
- scala: 2.12.19
java: temurin@17
- scala: 3.3.3
java: temurin@17
Expand Down Expand Up @@ -188,12 +188,12 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

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

- name: Inflate target directories (2.12.18, rootJVM)
- name: Inflate target directories (2.12.19, rootJVM)
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
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ThisBuild / developers := List(
ThisBuild / tlSitePublishBranch := Some("main")

val Scala213 = "2.13.11"
ThisBuild / crossScalaVersions := Seq("2.12.18", Scala213, "3.3.3")
ThisBuild / crossScalaVersions := Seq("2.12.19", Scala213, "3.3.3")
ThisBuild / scalaVersion := Scala213 // the default Scala

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

val asyncHttpClientVersion = "2.12.3"
val jettyVersion = "10.0.15"
val http4sVersion = "0.23.25"
val http4sVersion = "0.23.27"
val munitCatsEffectVersion = "1.0.7"
val servletApiVersion = "4.0.1"

Expand Down
59 changes: 32 additions & 27 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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.2
sbt.version=1.9.9

0 comments on commit ab722e9

Please sign in to comment.