diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index 819f0117..c6cd13f0 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -7,7 +7,7 @@ jobs: auto-approve: runs-on: ubuntu-20.04 steps: - - uses: hmarr/auto-approve-action@v2.4.0 + - uses: hmarr/auto-approve-action@v3.0.0 if: github.actor == 'eikek-scala-steward' with: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.mergify.yml b/.mergify.yml index fb03ac7d..ec6b13f2 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,7 +1,7 @@ pull_request_rules: - name: assign and label scala-steward's PRs conditions: - - author=eikek-scala-steward + - author=eikek-scala-steward[bot] actions: assign: users: [eikek] @@ -9,7 +9,7 @@ pull_request_rules: add: ["type: dependencies"] - name: automatically merge Scala Steward PRs on CI success conditions: - - author=eikek-scala-steward + - author=eikek-scala-steward[bot] - base=master - status-success=ci actions: diff --git a/build.sbt b/build.sbt index 6e2d5209..5d6ff0f7 100644 --- a/build.sbt +++ b/build.sbt @@ -16,7 +16,7 @@ val scalafixSettings = Seq( val sharedSettings = Seq( organization := "com.github.eikek", - scalaVersion := "2.13.9", + scalaVersion := "2.13.10", organizationName := "Eike K. & Contributors", licenses += ("AGPL-3.0-or-later", url( "https://spdx.org/licenses/AGPL-3.0-or-later.html" diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c0b821c7..06d97108 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -50,7 +50,7 @@ object Dependencies { val TikaVersion = "2.5.0" val YamuscaVersion = "0.9.0" val SwaggerUIVersion = "4.14.2" - val TestContainerVersion = "0.40.10" + val TestContainerVersion = "0.40.11" val TwelveMonkeysVersion = "3.8.3" val JQueryVersion = "3.5.1" diff --git a/project/plugins.sbt b/project/plugins.sbt index 759222b2..cc335d73 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.3") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("com.github.eikek" % "sbt-openapi-schema" % "0.9.0") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")