[pull] master from eikek:master

.git-blame-ignore-revs

@@ -0,0 +1,8 @@
+# Scala Steward: Reformat with scalafmt 3.8.2
+1c566cd5182d41f4cc06040fc347ddb4be617779
+
+# Scala Steward: Reformat with scalafmt 3.8.4
+f90502399d78e7a3eb07bd7a1d130e6ae9ba498c
+
+# Scala Steward: Reformat with scalafmt 3.9.0
+4e66b2f9f7ffe02dd065ceeebb7060ed3478c6e7

.github/release-drafter.yml

@@ -0,0 +1,42 @@
+name-template: "$RESOLVED_VERSION"
+tag-template: "$RESOLVED_VERSION"
+template: |
+  ## What’s Changed
+
+  $CHANGES
+
+categories:
+  - title: "🚀 Features"
+    labels:
+      - 'feature'
+      - 'enhancement'
+  - title: "🐛 Bug Fixes"
+    labels:
+      - 'fix'
+      - 'bug'
+  - title: "💚 Maintenance"
+    labels:
+      - 'chore'
+      - 'documentation'
+  - title: "🧱 Dependencies"
+    labels:
+      - 'dependencies'
+      - 'type: dependencies'
+
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+version-resolver:
+  major:
+    labels:
+      - 'breaking'
+  minor:
+    labels:
+      - 'feature'
+      - 'enhancement'
+  patch:
+    labels:
+      - 'chore'
+      - 'documentation'
+      - 'dependencies'
+  default: patch
+exclude-labels:
+  - 'skip-changelog'

.github/renovate.json

@@ -1,6 +1,6 @@
 {
   "automerge": true,
-  "labels": ["type: dependencies"],
+  "labels": ["dependencies"],
   "packageRules": [
     {
       "matchManagers": [

.github/workflows/auto-approve.yml

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

.github/workflows/ci-docs.yml

@@ -0,0 +1,18 @@
+name: Check Website
+on:
+  pull_request:
+    branches:
+      - "current-docs"
+      - "master"
+jobs:
+  check-website:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.2.2
+        with:
+          fetch-depth: 0
+      - uses: cachix/install-nix-action@v30
+      - name: Set current version
+        run:  echo "DOCSPELL_VERSION=$(cat version.sbt | grep version | cut -d= -f2 | xargs)" >> $GITHUB_ENV
+      - name: Build website (${{ env.DOCSPELL_VERSION }})
+        run: nix develop .#ci --command sbt make-website

.github/workflows/ci.yml

@@ -1,32 +1,24 @@
 name: CI
 on:
   pull_request:
+    branches:
+      - master
 jobs:
   ci-matrix:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        java: [ 'openjdk@1.11' ]
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v4.2.2
         with:
           fetch-depth: 100
-      - uses: jorelali/setup-elm@v3
-        with:
-          elm-version: 0.19.1
-      - uses: bahmutov/npm-install@v1
       - name: Fetch tags
         run: git fetch --depth=100 origin +refs/tags/*:refs/tags/*
-      - uses: olafurpg/setup-scala@v10
-        with:
-          java-version: ${{ matrix.java }}
-      - name: Coursier cache
-        uses: coursier/cache-action@v6
+      - uses: cachix/install-nix-action@v30
       - name: sbt ci ${{ github.ref }}
-        run: sbt ci
+        run: nix develop .#ci --command sbt ci
   ci:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [ci-matrix]
     steps:
       - name: Aggregate of lint, and all tests

.github/workflows/release-drafter.yml

@@ -0,0 +1,14 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v6
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-nightly.yml

@@ -0,0 +1,32 @@
+name: Release Nightly
+on:
+  push:
+    branches:
+      - "master"
+jobs:
+  release-nightly:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+    steps:
+      - uses: actions/checkout@v4.2.2
+        with:
+          fetch-depth: 0
+      - uses: cachix/install-nix-action@v30
+      - name: Set current version
+        run:  echo "DOCSPELL_VERSION=$(cat version.sbt | grep version | cut -d= -f2 | xargs)" >> $GITHUB_ENV
+      - name: sbt ci ${{ github.ref }}
+        run: nix develop .#ci --command sbt ci
+      - name: sbt make-pkg (${{ env.DOCSPELL_VERSION }})
+        run: nix develop .#ci --command sbt make-pkg
+      - uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "nightly"
+          prerelease: true
+          title: "Docspell Nightly"
+          files: |
+            modules/restserver/target/docspell-restserver_${{ env.DOCSPELL_VERSION }}_all.deb
+            modules/restserver/target/universal/docspell-restserver-${{ env.DOCSPELL_VERSION }}.zip
+            modules/joex/target/docspell-joex_${{ env.DOCSPELL_VERSION }}_all.deb
+            modules/joex/target/universal/docspell-joex-${{ env.DOCSPELL_VERSION }}.zip

.github/workflows/release.yml

@@ -0,0 +1,32 @@
+name: Release
+on:
+  push:
+    tags:
+      - 'v*'
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+    steps:
+      - uses: actions/checkout@v4.2.2
+        with:
+          fetch-depth: 0
+      - uses: cachix/install-nix-action@v30
+      - name: Set current version
+        run:  echo "DOCSPELL_VERSION=$(cat version.sbt | grep version | cut -d= -f2 | xargs)" >> $GITHUB_ENV
+      - name: sbt make-pkg (${{ env.DOCSPELL_VERSION }})
+        run: nix develop .#ci --command sbt make-pkg
+      - uses: meeDamian/github-release@2.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          name: Docspell ${{ env.DOCSPELL_VERSION }}
+          gzip: false
+          draft: true
+          prerelease: false
+          allow_override: false
+          files: >
+            modules/restserver/target/docspell-restserver_${{ env.DOCSPELL_VERSION }}_all.deb
+            modules/restserver/target/universal/docspell-restserver-${{ env.DOCSPELL_VERSION }}.zip
+            modules/joex/target/docspell-joex_${{ env.DOCSPELL_VERSION }}_all.deb
+            modules/joex/target/universal/docspell-joex-${{ env.DOCSPELL_VERSION }}.zip

.github/workflows/stale.yml

@@ -0,0 +1,21 @@
+name: 'Handle stale issues'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      # https://github.com/actions/stale
+      - uses: actions/stale@v9
+        with:
+          days-before-stale: 30
+          days-before-close: 7
+          only-labels: question
+          stale-issue-label: stale
+          stale-issue-message: >
+            This issue has been automatically marked as stale because it has not
+            had recent activity. It will be closed if no further activity
+            occurs. This only applies to 'question' issues. Always feel free to
+            reopen or create new issues. Thank you!

.github/workflows/website.yml

@@ -0,0 +1,21 @@
+name: Publish Website
+on:
+  push:
+    branches:
+      - "current-docs"
+jobs:
+  publish-website:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.2.2
+        with:
+          fetch-depth: 0
+      - uses: cachix/install-nix-action@v30
+      - name: Set current version
+        run:  echo "DOCSPELL_VERSION=$(cat version.sbt | grep version | cut -d= -f2 | xargs)" >> $GITHUB_ENV
+      - name: Build website (${{ env.DOCSPELL_VERSION }})
+        run: nix develop .#ci --command sbt make-website
+      - name: Publish website (${{ env.DOCSPELL_VERSION }})
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: nix develop .#ci --command sbt publish-website

.gitignore

@@ -1,4 +1,5 @@
 #artwork/*.png
+.envrc
 target/
 local/
 node_modules/
@@ -7,12 +8,31 @@ elm-stuff
 result
 _site/
 *.qcow2
-/website/site/content/docs/changelog/
+/website/site/content/docs/install/changelog.md
 /website/site/public/
 /website/site/static/openapi/
+/website/site/static/files/
 /website/site/static/js/bundle.js
+/website/site/static/styles.css
+/website/site/static/syntax-*.css
+/website/site/static/webfonts/
+/website/site/static/files/*.woff*
+/website/site/static/examples/
+/website/site/templates/shortcodes/addon-output
+/website/site/templates/shortcodes/item-data
+/website/site/templates/shortcodes/item-args
+/website/site/templates/shortcodes/file-meta
 /website/site/templates/shortcodes/server.conf
 /website/site/templates/shortcodes/sample-exim.conf
 /website/site/templates/shortcodes/joex.conf
+/website/site/templates/shortcodes/config.env.txt
 /docker/docs
 /docker/dev-log
+
+.idea/*
+sbt.json
+/yarn.lock
+.metals
+.vscode
+.bloop
+metals.sbt

.mergify.yml

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

.redocly.lint-ignore.yaml

@@ -0,0 +1,5 @@
+# This file instructs Redocly's linter to ignore the rules contained for specific parts of your API.
+# See https://redoc.ly/docs/cli/ for more information.
+modules/restapi/src/main/resources/docspell-openapi.yml:
+  spec:
+    - '#/extraSchemas'

.scala-steward.conf

@@ -1,7 +1,3 @@
 updates.ignore = [
   { groupId = "org.apache.poi" },
 ]
-
-updates.pin = [
-  { groupId = "co.fs2", version = "2." }
-]

.scalafmt.conf

@@ -1,6 +1,8 @@
-version = "2.7.5"
+version = "3.9.3"
 
-preset = defaultWithAlign
+preset = default
+align.preset = some
+runner.dialect = scala213source3
 
 maxColumn = 90
 
@@ -12,3 +14,10 @@ rewrite.rules = [
   PreferCurlyFors
   SortModifiers
 ]
+
+assumeStandardLibraryStripMargin = true
+align.stripMargin = true
+
+docstrings.style = SpaceAsterisk
+docstrings.oneline = fold
+docstrings.wrap = "yes"