Skip to content

Commit 1446654

Browse files
authored
Merge branch 'main' into update/scala-library-2.13.18
2 parents acba31e + dbfc3e8 commit 1446654

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
runs-on: ubuntu-latest
66
strategy:
77
matrix:
8-
scala: ["2.12.20", "2.13.18", "3.3.6"]
8+
scala: ["2.12.20", "2.13.18", "3.3.7"]
99
steps:
1010
- uses: actions/checkout@v2
1111
- uses: coursier/cache-action@v6

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.9.10
1+
version = 3.11.0
22
runner.dialect = scala212
33
fileOverride {
44
"glob:**.sbt" {

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ inThisBuild(
2020
)
2121

2222
scalaVersion := "2.12.20"
23-
crossScalaVersions := Seq("2.12.20", "2.13.18", "3.3.6")
23+
crossScalaVersions := Seq("2.12.20", "2.13.18", "3.3.7")
2424

2525
libraryDependencies ++=
2626
Seq(
2727
"com.github.ben-manes.caffeine" % "caffeine" % CaffeineVersion.value,
2828
"org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2",
2929
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "provided",
30-
"org.scalactic" %% "scalactic" % "3.2.19" % "test",
30+
"org.scalactic" %% "scalactic" % "3.2.20" % "test",
3131
"org.scalatest" %% "scalatest" % "3.2.19" % "test"
3232
)
3333

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.11.7
1+
sbt.version = 1.12.9

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.2")
22

33
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.15")
44

5-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
5+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.6.0")
66

77
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
88

0 commit comments

Comments
 (0)