diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7e1d68e..657243d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,6 +2,8 @@ name: Continuous Integration on: workflow_call: + merge_group: + branches: ['*'] pull_request: branches: ['*'] push: diff --git a/.scalafmt.conf b/.scalafmt.conf index fbca04c..0508d0c 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.1 +version = 3.8.3 runner.dialect = scala211 project.git = true align.preset = none diff --git a/build.sbt b/build.sbt index c0034ad..521d72b 100644 --- a/build.sbt +++ b/build.sbt @@ -72,7 +72,7 @@ libraryDependencies ++= Seq( "io.circe" %% "circe-parser" % circeVersion.value, "org.apache.spark" %% "spark-sql" % sparkVersion.value % Provided, "junit" % "junit" % "4.13.2" % Test, - "org.scalatest" %% "scalatest" % "3.2.18" % Test, + "org.scalatest" %% "scalatest" % "3.2.19" % Test, "com.github.sbt" % "junit-interface" % "0.13.3" % Test exclude ("junit", "junit-dep") ) diff --git a/project/assembly.sbt b/project/assembly.sbt index e5ab6cc..11fa359 100644 --- a/project/assembly.sbt +++ b/project/assembly.sbt @@ -1 +1 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0") diff --git a/project/build.properties b/project/build.properties index 49214c4..04a3949 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.9.9 +sbt.version = 1.10.4 diff --git a/project/plugins.sbt b/project/plugins.sbt index a56f0eb..330be84 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") -addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1") +addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")