Skip to content

Commit

Permalink
Merge branch 'main' into bastien.lemale/chore_update_caffeine_version
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Apr 4, 2024
2 parents 99e364a + 753c025 commit 3c6592e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
scala: ["2.12.18", "2.13.12", "3.3.1"]
scala: ["2.12.18", "2.13.13", "3.3.1"]
steps:
- uses: actions/checkout@v2
- uses: coursier/cache-action@v6
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.8.0
version = 3.8.1
runner.dialect = scala212
fileOverride {
"glob:**.sbt" {
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ inThisBuild(
)

scalaVersion := "2.12.18"
crossScalaVersions := Seq("2.12.18", "2.13.12", "3.3.1")
crossScalaVersions := Seq("2.12.18", "2.13.13", "3.3.1")

libraryDependencies ++=
Seq(
"com.github.ben-manes.caffeine" % "caffeine" % CaffeineVersion.value,
"org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "provided",
"org.scalactic" %% "scalactic" % "3.2.18" % "test",
"org.scalatest" %% "scalatest" % "3.2.17" % "test"
"org.scalatest" %% "scalatest" % "3.2.18" % "test"
)

scalafmtOnCompile := true
Expand Down

0 comments on commit 3c6592e

Please sign in to comment.