Skip to content

Commit

Permalink
Merge branch 'master' into update/sbt-scalafmt-2.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
colindean authored Jan 30, 2024
2 parents ca9073d + e7dc835 commit f935294
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ updates:
schedule:
interval: "daily"

# scala updates are handed by the Scala Steward action.
# Until Dependabot provides Scala updates, they are are handed by the Scala Steward action.
# https://github.com/target/data-validator/blob/master/.github/workflows/scala-steward.yaml
# Check periodically for updates: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: coursier/cache-action@v6
with:
extraKey: ${{ runner.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: coursier/cache-action@v6
with:
extraKey: ${{ runner.os }}
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.5
version = 3.7.12
runner.dialect = scala211
project.git = true
align.preset = none
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ libraryDependencies ++= Seq(
"io.circe" %% "circe-parser" % circeVersion,
"org.apache.spark" %% "spark-sql" % sparkVersion % Provided,
"junit" % "junit" % "4.13.2" % Test,
"org.scalatest" %% "scalatest" % "3.2.15" % Test,
"org.scalatest" %% "scalatest" % "3.2.16" % Test,
"com.github.sbt" % "junit-interface" % "0.13.3" % Test exclude ("junit", "junit-dep")
)

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.8.2
sbt.version = 1.9.8

0 comments on commit f935294

Please sign in to comment.