TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 10:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into update/swagger-ui-4.14.3

Browse Source
This commit is contained in:
eikek-scala-steward 2022-10-15 06:27:24 +00:00
commit 5e83200b50
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/auto-approve.yml vendored
View File

@ -7,7 +7,7 @@ jobs:
auto-approve: auto-approve:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: hmarr/auto-approve-action@v2.4.0 - uses: hmarr/auto-approve-action@v3.0.0
if: github.actor == 'eikek-scala-steward' if: github.actor == 'eikek-scala-steward'
with: with:
github-token: ${{ secrets.GITHUB_TOKEN }} github-token: ${{ secrets.GITHUB_TOKEN }}

4
.mergify.yml
View File

@ -1,7 +1,7 @@
pull_request_rules: pull_request_rules:
- name: assign and label scala-steward's PRs - name: assign and label scala-steward's PRs
conditions: conditions:
- author=eikek-scala-steward - author=eikek-scala-steward[bot]
actions: actions:
assign: assign:
users: [eikek] users: [eikek]
@ -9,7 +9,7 @@ pull_request_rules:
add: ["type: dependencies"] add: ["type: dependencies"]
- name: automatically merge Scala Steward PRs on CI success - name: automatically merge Scala Steward PRs on CI success
conditions: conditions:
- author=eikek-scala-steward - author=eikek-scala-steward[bot]
- base=master - base=master
- status-success=ci - status-success=ci
actions: actions:

2
build.sbt
View File

@ -16,7 +16,7 @@ val scalafixSettings = Seq(
val sharedSettings = Seq( val sharedSettings = Seq(
organization := "com.github.eikek", organization := "com.github.eikek",
scalaVersion := "2.13.9", scalaVersion := "2.13.10",
organizationName := "Eike K. & Contributors", organizationName := "Eike K. & Contributors",
licenses += ("AGPL-3.0-or-later", url( licenses += ("AGPL-3.0-or-later", url(
"https://spdx.org/licenses/AGPL-3.0-or-later.html" "https://spdx.org/licenses/AGPL-3.0-or-later.html"

2
project/Dependencies.scala
View File

@ -50,7 +50,7 @@ object Dependencies {
val TikaVersion = "2.5.0" val TikaVersion = "2.5.0"
val YamuscaVersion = "0.9.0" val YamuscaVersion = "0.9.0"
val SwaggerUIVersion = "4.14.2" val SwaggerUIVersion = "4.14.2"
val TestContainerVersion = "0.40.10" val TestContainerVersion = "0.40.11"
val TwelveMonkeysVersion = "3.8.3" val TwelveMonkeysVersion = "3.8.3"
val JQueryVersion = "3.5.1" val JQueryVersion = "3.5.1"

2
project/plugins.sbt
View File

@ -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.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("com.github.eikek" % "sbt-openapi-schema" % "0.9.0") addSbtPlugin("com.github.eikek" % "sbt-openapi-schema" % "0.9.0")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")