Skip to content

Commit b338511

Browse files
authored
Merge branch 'master' into update/sbt-1.8.2
2 parents 9fdd1ce + e73fe5b commit b338511

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@v3
2020

2121
- name: Setup Java and Scala
22-
uses: olafurpg/setup-scala@v13
22+
uses: olafurpg/setup-scala@v14
2323
with:
2424
java-version: [email protected]
2525

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/checkout@v3
1919

2020
- name: Setup Java and Scala
21-
uses: olafurpg/setup-scala@v13
21+
uses: olafurpg/setup-scala@v14
2222
with:
2323
java-version: [email protected]
2424

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.6.1
1+
version = 3.7.3
22
runner.dialect = scala211
33
project.git = true
44
align.preset = none

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ libraryDependencies ++= Seq(
4141
"io.circe" %% "circe-parser" % circeVersion,
4242
"org.apache.spark" %% "spark-sql" % sparkVersion % Provided,
4343
"junit" % "junit" % "4.13.2" % Test,
44-
"org.scalatest" %% "scalatest" % "3.2.14" % Test,
44+
"org.scalatest" %% "scalatest" % "3.2.15" % Test,
4545
"com.github.sbt" % "junit-interface" % "0.13.3" % Test exclude ("junit", "junit-dep")
4646
)
4747

project/assembly.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.0.0")
1+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
2-
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.0")
2+
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1")
33
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
44
addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3")
55
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")

0 commit comments

Comments
 (0)