From 41bc33a73b676525215dc23349160d9ba63aca45 Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Sun, 28 Feb 2021 23:35:34 +0100
Subject: [PATCH 1/3] Update travis build to scala 2.13.5 and jdk11

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d78ff4b0..f972df1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 language: scala
 scala:
-  - 2.13.3
+  - 2.13.5
 
 jdk:
-  - openjdk8
+  - openjdk11
 
 cache:
   directories:

From e6d9ce2c3740b121cb88366e65eee7d427dddf80 Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Mon, 1 Mar 2021 00:08:25 +0100
Subject: [PATCH 2/3] Remove obsolete type capabilities

These are now detected by the new scala compiler and lead to compile
errors.
---
 build.sbt                                                   | 6 ++----
 .../src/main/scala/docspell/analysis/TextAnalyser.scala     | 2 +-
 modules/joex/src/main/scala/docspell/joex/JoexAppImpl.scala | 4 ++--
 .../src/main/scala/docspell/joex/fts/MigrationTask.scala    | 2 +-
 .../joex/src/main/scala/docspell/joex/fts/ReIndexTask.scala | 2 +-
 .../src/main/scala/docspell/joex/hk/CheckNodesTask.scala    | 2 +-
 .../src/main/scala/docspell/joex/hk/HouseKeepingTask.scala  | 2 +-
 .../scala/docspell/joex/learn/LearnClassifierTask.scala     | 4 ++--
 .../joex/src/main/scala/docspell/joex/mail/ReadMail.scala   | 4 ++--
 .../scala/docspell/joex/notify/NotifyDueItemsTask.scala     | 2 +-
 .../scala/docspell/joex/pagecount/AllPageCountTask.scala    | 2 +-
 .../main/scala/docspell/joex/pagecount/PageCountTask.scala  | 4 ++--
 .../scala/docspell/joex/pdfconv/ConvertAllPdfTask.scala     | 2 +-
 .../src/main/scala/docspell/joex/pdfconv/PdfConvTask.scala  | 2 +-
 .../main/scala/docspell/joex/preview/AllPreviewsTask.scala  | 2 +-
 .../main/scala/docspell/joex/preview/MakePreviewTask.scala  | 2 +-
 .../scala/docspell/joex/process/AttachmentPageCount.scala   | 2 +-
 .../scala/docspell/joex/process/AttachmentPreview.scala     | 2 +-
 .../src/main/scala/docspell/joex/process/ConvertPdf.scala   | 2 +-
 .../src/main/scala/docspell/joex/process/CreateItem.scala   | 2 +-
 .../main/scala/docspell/joex/process/DuplicateCheck.scala   | 2 +-
 .../main/scala/docspell/joex/process/ExtractArchive.scala   | 4 ++--
 .../src/main/scala/docspell/joex/process/ItemHandler.scala  | 4 ++--
 .../main/scala/docspell/joex/process/ReProcessItem.scala    | 2 +-
 .../main/scala/docspell/joex/process/TextExtraction.scala   | 2 +-
 .../scala/docspell/joex/scanmailbox/ScanMailboxTask.scala   | 2 +-
 .../scala/docspell/joex/scheduler/PeriodicScheduler.scala   | 2 +-
 .../docspell/joex/scheduler/PeriodicSchedulerImpl.scala     | 2 +-
 .../src/main/scala/docspell/restserver/RestAppImpl.scala    | 4 ++--
 .../main/scala/docspell/restserver/conv/Conversions.scala   | 2 +-
 .../store/src/main/scala/docspell/store/queries/QJob.scala  | 4 ++--
 31 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/build.sbt b/build.sbt
index c7eb44ec..2c9db4f1 100644
--- a/build.sbt
+++ b/build.sbt
@@ -696,8 +696,7 @@ def packageTools(logger: Logger, dir: File, version: String): Seq[File] = {
       wx / "icons" / "logo-96.png"     -> "icons/logo-96.png",
       wx / "manifest.json"             -> "manifest.json"
     ),
-    webext,
-    None
+    webext
   )
 
   val excludes = Seq(wx, target)
@@ -714,8 +713,7 @@ def packageTools(logger: Logger, dir: File, version: String): Seq[File] = {
       wx / "native/app_manifest.json" -> s"docspell-tools-${version}/firefox/native/app_manifest.json",
       wx / "native/native.py"         -> s"docspell-tools-${version}/firefox/native/native.py"
     ) ++ files,
-    archive,
-    None
+    archive
   )
 
   Seq(archive)
diff --git a/modules/analysis/src/main/scala/docspell/analysis/TextAnalyser.scala b/modules/analysis/src/main/scala/docspell/analysis/TextAnalyser.scala
index bf3bd8ff..2b84c4e2 100644
--- a/modules/analysis/src/main/scala/docspell/analysis/TextAnalyser.scala
+++ b/modules/analysis/src/main/scala/docspell/analysis/TextAnalyser.scala
@@ -82,7 +82,7 @@ object TextAnalyser {
 
   /** Provides the nlp pipeline based on the configuration. */
   private object Nlp {
-    def apply[F[_]: Concurrent: Timer: BracketThrow](
+    def apply[F[_]: Concurrent: Timer](
         cfg: TextAnalysisConfig.NlpConfig
     ): F[Input[F] => F[Vector[NerLabel]]] =
       cfg.mode match {
diff --git a/modules/joex/src/main/scala/docspell/joex/JoexAppImpl.scala b/modules/joex/src/main/scala/docspell/joex/JoexAppImpl.scala
index c221f187..69a48906 100644
--- a/modules/joex/src/main/scala/docspell/joex/JoexAppImpl.scala
+++ b/modules/joex/src/main/scala/docspell/joex/JoexAppImpl.scala
@@ -33,7 +33,7 @@ import emil.javamail._
 import org.http4s.client.Client
 import org.http4s.client.blaze.BlazeClientBuilder
 
-final class JoexAppImpl[F[_]: ConcurrentEffect: ContextShift: Timer](
+final class JoexAppImpl[F[_]: ConcurrentEffect: Timer](
     cfg: Config,
     nodeOps: ONode[F],
     store: Store[F],
@@ -214,7 +214,7 @@ object JoexAppImpl {
       appR <- Resource.make(app.init.map(_ => app))(_.shutdown)
     } yield appR
 
-  private def createFtsClient[F[_]: ConcurrentEffect: ContextShift](
+  private def createFtsClient[F[_]: ConcurrentEffect](
       cfg: Config
   )(client: Client[F]): Resource[F, FtsClient[F]] =
     if (cfg.fullTextSearch.enabled) SolrFtsClient(cfg.fullTextSearch.solr, client)
diff --git a/modules/joex/src/main/scala/docspell/joex/fts/MigrationTask.scala b/modules/joex/src/main/scala/docspell/joex/fts/MigrationTask.scala
index b8b27b5e..c887b1a1 100644
--- a/modules/joex/src/main/scala/docspell/joex/fts/MigrationTask.scala
+++ b/modules/joex/src/main/scala/docspell/joex/fts/MigrationTask.scala
@@ -25,7 +25,7 @@ object MigrationTask {
         )
       )
 
-  def onCancel[F[_]: Sync]: Task[F, Unit, Unit] =
+  def onCancel[F[_]]: Task[F, Unit, Unit] =
     Task.log[F, Unit](_.warn("Cancelling full-text-index task"))
 
   def job[F[_]: Sync]: F[RJob] =
diff --git a/modules/joex/src/main/scala/docspell/joex/fts/ReIndexTask.scala b/modules/joex/src/main/scala/docspell/joex/fts/ReIndexTask.scala
index 5dd45943..3e983575 100644
--- a/modules/joex/src/main/scala/docspell/joex/fts/ReIndexTask.scala
+++ b/modules/joex/src/main/scala/docspell/joex/fts/ReIndexTask.scala
@@ -24,7 +24,7 @@ object ReIndexTask {
         Task(ctx => clearData[F](ctx.args.collective).forContext(cfg, fts).run(ctx))
       )
 
-  def onCancel[F[_]: Sync]: Task[F, Args, Unit] =
+  def onCancel[F[_]]: Task[F, Args, Unit] =
     Task.log[F, Args](_.warn("Cancelling full-text re-index task"))
 
   private def clearData[F[_]: ConcurrentEffect](collective: Option[Ident]): FtsWork[F] =
diff --git a/modules/joex/src/main/scala/docspell/joex/hk/CheckNodesTask.scala b/modules/joex/src/main/scala/docspell/joex/hk/CheckNodesTask.scala
index 7f925690..8380a07d 100644
--- a/modules/joex/src/main/scala/docspell/joex/hk/CheckNodesTask.scala
+++ b/modules/joex/src/main/scala/docspell/joex/hk/CheckNodesTask.scala
@@ -58,7 +58,7 @@ object CheckNodesTask {
     } yield res.isRight
   }
 
-  def removeNodes[F[_]: Sync](
+  def removeNodes[F[_]](
       ctx: Context[F, _],
       cfg: HouseKeepingConfig.CheckNodes
   ): F[Int] =
diff --git a/modules/joex/src/main/scala/docspell/joex/hk/HouseKeepingTask.scala b/modules/joex/src/main/scala/docspell/joex/hk/HouseKeepingTask.scala
index 1c7d74c9..1728045d 100644
--- a/modules/joex/src/main/scala/docspell/joex/hk/HouseKeepingTask.scala
+++ b/modules/joex/src/main/scala/docspell/joex/hk/HouseKeepingTask.scala
@@ -23,7 +23,7 @@ object HouseKeepingTask {
       .flatMap(_ => CleanupJobsTask(cfg.houseKeeping.cleanupJobs))
       .flatMap(_ => CheckNodesTask(cfg.houseKeeping.checkNodes))
 
-  def onCancel[F[_]: Sync]: Task[F, Unit, Unit] =
+  def onCancel[F[_]]: Task[F, Unit, Unit] =
     Task.log[F, Unit](_.warn("Cancelling house-keeping task"))
 
   def periodicTask[F[_]: Sync](ce: CalEvent): F[RPeriodicTask] =
diff --git a/modules/joex/src/main/scala/docspell/joex/learn/LearnClassifierTask.scala b/modules/joex/src/main/scala/docspell/joex/learn/LearnClassifierTask.scala
index 89d7886a..5387fdc8 100644
--- a/modules/joex/src/main/scala/docspell/joex/learn/LearnClassifierTask.scala
+++ b/modules/joex/src/main/scala/docspell/joex/learn/LearnClassifierTask.scala
@@ -17,7 +17,7 @@ object LearnClassifierTask {
 
   type Args = LearnClassifierArgs
 
-  def onCancel[F[_]: Sync]: Task[F, Args, Unit] =
+  def onCancel[F[_]]: Task[F, Args, Unit] =
     Task.log(_.warn("Cancelling learn-classifier task"))
 
   def apply[F[_]: Sync: ContextShift](
@@ -100,7 +100,7 @@ object LearnClassifierTask {
     else
       OptionT.none
 
-  private def logInactiveWarning[F[_]: Sync](logger: Logger[F]): F[Unit] =
+  private def logInactiveWarning[F[_]](logger: Logger[F]): F[Unit] =
     logger.warn(
       "Auto-tagging is disabled. Check joex config and the collective settings."
     )
diff --git a/modules/joex/src/main/scala/docspell/joex/mail/ReadMail.scala b/modules/joex/src/main/scala/docspell/joex/mail/ReadMail.scala
index ce5bd3ca..e1a88844 100644
--- a/modules/joex/src/main/scala/docspell/joex/mail/ReadMail.scala
+++ b/modules/joex/src/main/scala/docspell/joex/mail/ReadMail.scala
@@ -15,7 +15,7 @@ import emil.{MimeType => _, _}
 
 object ReadMail {
 
-  def readBytesP[F[_]: ConcurrentEffect: ContextShift](
+  def readBytesP[F[_]: ConcurrentEffect](
       logger: Logger[F],
       glob: Glob
   ): Pipe[F, Byte, Binary[F]] =
@@ -26,7 +26,7 @@ object ReadMail {
       Stream.eval(logger.debug(s"Converting e-mail file...")) >>
         s.through(Mail.readBytes[F])
 
-  def mailToEntries[F[_]: ConcurrentEffect: ContextShift](
+  def mailToEntries[F[_]: ConcurrentEffect](
       logger: Logger[F],
       glob: Glob
   )(mail: Mail[F]): Stream[F, Binary[F]] = {
diff --git a/modules/joex/src/main/scala/docspell/joex/notify/NotifyDueItemsTask.scala b/modules/joex/src/main/scala/docspell/joex/notify/NotifyDueItemsTask.scala
index 78ec0882..e31b6fd7 100644
--- a/modules/joex/src/main/scala/docspell/joex/notify/NotifyDueItemsTask.scala
+++ b/modules/joex/src/main/scala/docspell/joex/notify/NotifyDueItemsTask.scala
@@ -40,7 +40,7 @@ object NotifyDueItemsTask {
       } yield ()
     }
 
-  def onCancel[F[_]: Sync]: Task[F, NotifyDueItemsArgs, Unit] =
+  def onCancel[F[_]]: Task[F, NotifyDueItemsArgs, Unit] =
     Task.log(_.warn("Cancelling notify-due-items task"))
 
   def getMailSettings[F[_]: Sync](ctx: Context[F, Args]): F[RUserEmail] =
diff --git a/modules/joex/src/main/scala/docspell/joex/pagecount/AllPageCountTask.scala b/modules/joex/src/main/scala/docspell/joex/pagecount/AllPageCountTask.scala
index 43a93146..5e0b542e 100644
--- a/modules/joex/src/main/scala/docspell/joex/pagecount/AllPageCountTask.scala
+++ b/modules/joex/src/main/scala/docspell/joex/pagecount/AllPageCountTask.scala
@@ -28,7 +28,7 @@ object AllPageCountTask {
       } yield ()
     }
 
-  def onCancel[F[_]: Sync]: Task[F, Args, Unit] =
+  def onCancel[F[_]]: Task[F, Args, Unit] =
     Task.log(_.warn("Cancelling all-previews task"))
 
   def submitConversionJobs[F[_]: Sync](
diff --git a/modules/joex/src/main/scala/docspell/joex/pagecount/PageCountTask.scala b/modules/joex/src/main/scala/docspell/joex/pagecount/PageCountTask.scala
index d69d4fe3..c0d8f988 100644
--- a/modules/joex/src/main/scala/docspell/joex/pagecount/PageCountTask.scala
+++ b/modules/joex/src/main/scala/docspell/joex/pagecount/PageCountTask.scala
@@ -30,7 +30,7 @@ object MakePageCountTask {
       } yield ()
     }
 
-  def onCancel[F[_]: Sync]: Task[F, Args, Unit] =
+  def onCancel[F[_]]: Task[F, Args, Unit] =
     Task.log(_.warn("Cancelling make-page-count task"))
 
   private def generatePageCount[F[_]: Sync](
@@ -45,7 +45,7 @@ object MakePageCountTask {
         )
     } yield ()
 
-  private def pageCountExists[F[_]: Sync](ctx: Context[F, Args]): F[Boolean] =
+  private def pageCountExists[F[_]](ctx: Context[F, Args]): F[Boolean] =
     ctx.store.transact(
       RAttachmentMeta
         .findPageCountById(ctx.args.attachment)
diff --git a/modules/joex/src/main/scala/docspell/joex/pdfconv/ConvertAllPdfTask.scala b/modules/joex/src/main/scala/docspell/joex/pdfconv/ConvertAllPdfTask.scala
index 019894fa..e97ce780 100644
--- a/modules/joex/src/main/scala/docspell/joex/pdfconv/ConvertAllPdfTask.scala
+++ b/modules/joex/src/main/scala/docspell/joex/pdfconv/ConvertAllPdfTask.scala
@@ -28,7 +28,7 @@ object ConvertAllPdfTask {
       } yield ()
     }
 
-  def onCancel[F[_]: Sync]: Task[F, Args, Unit] =
+  def onCancel[F[_]]: Task[F, Args, Unit] =
     Task.log(_.warn("Cancelling convert-old-pdf task"))
 
   def submitConversionJobs[F[_]: Sync](
diff --git a/modules/joex/src/main/scala/docspell/joex/pdfconv/PdfConvTask.scala b/modules/joex/src/main/scala/docspell/joex/pdfconv/PdfConvTask.scala
index 5069f0ec..4eb7cd35 100644
--- a/modules/joex/src/main/scala/docspell/joex/pdfconv/PdfConvTask.scala
+++ b/modules/joex/src/main/scala/docspell/joex/pdfconv/PdfConvTask.scala
@@ -44,7 +44,7 @@ object PdfConvTask {
       } yield ()
     }
 
-  def onCancel[F[_]: Sync]: Task[F, Args, Unit] =
+  def onCancel[F[_]]: Task[F, Args, Unit] =
     Task.log(_.warn("Cancelling pdfconv task"))
 
   // --- Helper
diff --git a/modules/joex/src/main/scala/docspell/joex/preview/AllPreviewsTask.scala b/modules/joex/src/main/scala/docspell/joex/preview/AllPreviewsTask.scala
index 9efed3a1..ba8a94b6 100644
--- a/modules/joex/src/main/scala/docspell/joex/preview/AllPreviewsTask.scala
+++ b/modules/joex/src/main/scala/docspell/joex/preview/AllPreviewsTask.scala
@@ -28,7 +28,7 @@ object AllPreviewsTask {
       } yield ()
     }
 
-  def onCancel[F[_]: Sync]: Task[F, Args, Unit] =
+  def onCancel[F[_]]: Task[F, Args, Unit] =
     Task.log(_.warn("Cancelling all-previews task"))
 
   def submitConversionJobs[F[_]: Sync](
diff --git a/modules/joex/src/main/scala/docspell/joex/preview/MakePreviewTask.scala b/modules/joex/src/main/scala/docspell/joex/preview/MakePreviewTask.scala
index 6e626b17..8d2b6cf6 100644
--- a/modules/joex/src/main/scala/docspell/joex/preview/MakePreviewTask.scala
+++ b/modules/joex/src/main/scala/docspell/joex/preview/MakePreviewTask.scala
@@ -34,7 +34,7 @@ object MakePreviewTask {
       } yield ()
     }
 
-  def onCancel[F[_]: Sync]: Task[F, Args, Unit] =
+  def onCancel[F[_]]: Task[F, Args, Unit] =
     Task.log(_.warn("Cancelling make-preview task"))
 
   private def generatePreview[F[_]: Sync](
diff --git a/modules/joex/src/main/scala/docspell/joex/process/AttachmentPageCount.scala b/modules/joex/src/main/scala/docspell/joex/process/AttachmentPageCount.scala
index 0373db8a..8082213b 100644
--- a/modules/joex/src/main/scala/docspell/joex/process/AttachmentPageCount.scala
+++ b/modules/joex/src/main/scala/docspell/joex/process/AttachmentPageCount.scala
@@ -22,7 +22,7 @@ import bitpeace.{Mimetype, RangeDef}
   */
 object AttachmentPageCount {
 
-  def apply[F[_]: Sync: ContextShift]()(
+  def apply[F[_]: Sync]()(
       item: ItemData
   ): Task[F, ProcessItemArgs, ItemData] =
     Task { ctx =>
diff --git a/modules/joex/src/main/scala/docspell/joex/process/AttachmentPreview.scala b/modules/joex/src/main/scala/docspell/joex/process/AttachmentPreview.scala
index 57a0c170..f0f26ed2 100644
--- a/modules/joex/src/main/scala/docspell/joex/process/AttachmentPreview.scala
+++ b/modules/joex/src/main/scala/docspell/joex/process/AttachmentPreview.scala
@@ -24,7 +24,7 @@ import bitpeace.{Mimetype, MimetypeHint, RangeDef}
   */
 object AttachmentPreview {
 
-  def apply[F[_]: Sync: ContextShift](cfg: ConvertConfig, pcfg: PreviewConfig)(
+  def apply[F[_]: Sync](cfg: ConvertConfig, pcfg: PreviewConfig)(
       item: ItemData
   ): Task[F, ProcessItemArgs, ItemData] =
     Task { ctx =>
diff --git a/modules/joex/src/main/scala/docspell/joex/process/ConvertPdf.scala b/modules/joex/src/main/scala/docspell/joex/process/ConvertPdf.scala
index 56c27666..57292563 100644
--- a/modules/joex/src/main/scala/docspell/joex/process/ConvertPdf.scala
+++ b/modules/joex/src/main/scala/docspell/joex/process/ConvertPdf.scala
@@ -61,7 +61,7 @@ object ConvertPdf {
 
     }
 
-  def isConverted[F[_]: Sync](ctx: Context[F, ProcessItemArgs])(
+  def isConverted[F[_]](ctx: Context[F, ProcessItemArgs])(
       ra: RAttachment
   ): F[Boolean] =
     ctx.store.transact(RAttachmentSource.isConverted(ra.id))
diff --git a/modules/joex/src/main/scala/docspell/joex/process/CreateItem.scala b/modules/joex/src/main/scala/docspell/joex/process/CreateItem.scala
index c24ad98c..90a4b8a5 100644
--- a/modules/joex/src/main/scala/docspell/joex/process/CreateItem.scala
+++ b/modules/joex/src/main/scala/docspell/joex/process/CreateItem.scala
@@ -113,7 +113,7 @@ object CreateItem {
       )
     }
 
-  def insertAttachment[F[_]: Sync](ctx: Context[F, _])(ra: RAttachment): F[Int] = {
+  def insertAttachment[F[_]](ctx: Context[F, _])(ra: RAttachment): F[Int] = {
     val rs = RAttachmentSource.of(ra)
     ctx.store.transact(for {
       n <- RAttachment.insert(ra)
diff --git a/modules/joex/src/main/scala/docspell/joex/process/DuplicateCheck.scala b/modules/joex/src/main/scala/docspell/joex/process/DuplicateCheck.scala
index eee06755..6d34db07 100644
--- a/modules/joex/src/main/scala/docspell/joex/process/DuplicateCheck.scala
+++ b/modules/joex/src/main/scala/docspell/joex/process/DuplicateCheck.scala
@@ -53,7 +53,7 @@ object DuplicateCheck {
     else ().pure[F]
   }
 
-  private def findDuplicates[F[_]: Sync](
+  private def findDuplicates[F[_]](
       ctx: Context[F, Args]
   ): F[Vector[FileMetaDupes]] =
     ctx.store.transact(for {
diff --git a/modules/joex/src/main/scala/docspell/joex/process/ExtractArchive.scala b/modules/joex/src/main/scala/docspell/joex/process/ExtractArchive.scala
index 7de6a086..0d33d243 100644
--- a/modules/joex/src/main/scala/docspell/joex/process/ExtractArchive.scala
+++ b/modules/joex/src/main/scala/docspell/joex/process/ExtractArchive.scala
@@ -150,7 +150,7 @@ object ExtractArchive {
         .lastOrError
   }
 
-  def extractMail[F[_]: ConcurrentEffect: ContextShift](
+  def extractMail[F[_]: ConcurrentEffect](
       ctx: Context[F, ProcessItemArgs],
       archive: Option[RAttachmentArchive]
   )(ra: RAttachment, pos: Int): F[Extracted] = {
@@ -225,7 +225,7 @@ object ExtractArchive {
     } yield n1 + n2
   }
 
-  def storeArchive[F[_]: Sync](ctx: Context[F, _])(aa: RAttachmentArchive): F[Int] =
+  def storeArchive[F[_]](ctx: Context[F, _])(aa: RAttachmentArchive): F[Int] =
     ctx.store.transact(RAttachmentArchive.insert(aa))
 
   case class Extracted(
diff --git a/modules/joex/src/main/scala/docspell/joex/process/ItemHandler.scala b/modules/joex/src/main/scala/docspell/joex/process/ItemHandler.scala
index 1bd0f97a..90334bfd 100644
--- a/modules/joex/src/main/scala/docspell/joex/process/ItemHandler.scala
+++ b/modules/joex/src/main/scala/docspell/joex/process/ItemHandler.scala
@@ -18,7 +18,7 @@ import docspell.store.records.RItem
 object ItemHandler {
   type Args = ProcessItemArgs
 
-  def onCancel[F[_]: Sync: ContextShift]: Task[F, Args, Unit] =
+  def onCancel[F[_]: Sync]: Task[F, Args, Unit] =
     logWarn("Now cancelling.").flatMap(_ =>
       markItemCreated.flatMap {
         case true =>
@@ -105,7 +105,7 @@ object ItemHandler {
         )
     }
 
-  private def deleteByFileIds[F[_]: Sync: ContextShift]: Task[F, Args, Unit] =
+  private def deleteByFileIds[F[_]: Sync]: Task[F, Args, Unit] =
     Task { ctx =>
       val states = ItemState.invalidStates
       for {
diff --git a/modules/joex/src/main/scala/docspell/joex/process/ReProcessItem.scala b/modules/joex/src/main/scala/docspell/joex/process/ReProcessItem.scala
index 42db6033..e4e40f49 100644
--- a/modules/joex/src/main/scala/docspell/joex/process/ReProcessItem.scala
+++ b/modules/joex/src/main/scala/docspell/joex/process/ReProcessItem.scala
@@ -29,7 +29,7 @@ object ReProcessItem {
       .flatMap(safeProcess[F](cfg, fts, analyser, regexNer))
       .map(_ => ())
 
-  def onCancel[F[_]: Sync: ContextShift]: Task[F, Args, Unit] =
+  def onCancel[F[_]]: Task[F, Args, Unit] =
     logWarn("Now cancelling re-processing.")
 
   // --- Helpers
diff --git a/modules/joex/src/main/scala/docspell/joex/process/TextExtraction.scala b/modules/joex/src/main/scala/docspell/joex/process/TextExtraction.scala
index 80b4b13e..fcdd6f98 100644
--- a/modules/joex/src/main/scala/docspell/joex/process/TextExtraction.scala
+++ b/modules/joex/src/main/scala/docspell/joex/process/TextExtraction.scala
@@ -119,7 +119,7 @@ object TextExtraction {
       )
     } yield (meta, tags)
 
-  def extractText[F[_]: Sync: ContextShift](
+  def extractText[F[_]: Sync](
       ctx: Context[F, _],
       extr: Extraction[F],
       lang: Language
diff --git a/modules/joex/src/main/scala/docspell/joex/scanmailbox/ScanMailboxTask.scala b/modules/joex/src/main/scala/docspell/joex/scanmailbox/ScanMailboxTask.scala
index 741f2a00..fba08dcf 100644
--- a/modules/joex/src/main/scala/docspell/joex/scanmailbox/ScanMailboxTask.scala
+++ b/modules/joex/src/main/scala/docspell/joex/scanmailbox/ScanMailboxTask.scala
@@ -46,7 +46,7 @@ object ScanMailboxTask {
       } yield ()
     }
 
-  def onCancel[F[_]: Sync]: Task[F, ScanMailboxArgs, Unit] =
+  def onCancel[F[_]]: Task[F, ScanMailboxArgs, Unit] =
     Task.log(_.warn("Cancelling scan-mailbox task"))
 
   def getMailSettings[F[_]: Sync](ctx: Context[F, Args]): F[RUserImap] =
diff --git a/modules/joex/src/main/scala/docspell/joex/scheduler/PeriodicScheduler.scala b/modules/joex/src/main/scala/docspell/joex/scheduler/PeriodicScheduler.scala
index 106adb77..6b406861 100644
--- a/modules/joex/src/main/scala/docspell/joex/scheduler/PeriodicScheduler.scala
+++ b/modules/joex/src/main/scala/docspell/joex/scheduler/PeriodicScheduler.scala
@@ -31,7 +31,7 @@ trait PeriodicScheduler[F[_]] {
 
 object PeriodicScheduler {
 
-  def create[F[_]: ConcurrentEffect: ContextShift](
+  def create[F[_]: ConcurrentEffect](
       cfg: PeriodicSchedulerConfig,
       sch: Scheduler[F],
       queue: JobQueue[F],
diff --git a/modules/joex/src/main/scala/docspell/joex/scheduler/PeriodicSchedulerImpl.scala b/modules/joex/src/main/scala/docspell/joex/scheduler/PeriodicSchedulerImpl.scala
index db85019e..c7ae4edd 100644
--- a/modules/joex/src/main/scala/docspell/joex/scheduler/PeriodicSchedulerImpl.scala
+++ b/modules/joex/src/main/scala/docspell/joex/scheduler/PeriodicSchedulerImpl.scala
@@ -15,7 +15,7 @@ import docspell.store.records.RPeriodicTask
 import com.github.eikek.fs2calev._
 import org.log4s.getLogger
 
-final class PeriodicSchedulerImpl[F[_]: ConcurrentEffect: ContextShift](
+final class PeriodicSchedulerImpl[F[_]: ConcurrentEffect](
     val config: PeriodicSchedulerConfig,
     sch: Scheduler[F],
     queue: JobQueue[F],
diff --git a/modules/restserver/src/main/scala/docspell/restserver/RestAppImpl.scala b/modules/restserver/src/main/scala/docspell/restserver/RestAppImpl.scala
index 5ed4df61..a455dd76 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/RestAppImpl.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/RestAppImpl.scala
@@ -12,7 +12,7 @@ import docspell.ftssolr.SolrFtsClient
 
 import org.http4s.client.Client
 
-final class RestAppImpl[F[_]: Sync](val config: Config, val backend: BackendApp[F])
+final class RestAppImpl[F[_]](val config: Config, val backend: BackendApp[F])
     extends RestApp[F] {
 
   def init: F[Unit] =
@@ -38,7 +38,7 @@ object RestAppImpl {
       appR <- Resource.make(app.init.map(_ => app))(_.shutdown)
     } yield appR
 
-  private def createFtsClient[F[_]: ConcurrentEffect: ContextShift](
+  private def createFtsClient[F[_]: ConcurrentEffect](
       cfg: Config
   )(client: Client[F]): Resource[F, FtsClient[F]] =
     if (cfg.fullTextSearch.enabled) SolrFtsClient(cfg.fullTextSearch.solr, client)
diff --git a/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala b/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
index 284dfb18..4aebc8c8 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
@@ -606,7 +606,7 @@ trait Conversions {
       )
     })
 
-  def changeSource[F[_]: Sync](s: Source, coll: Ident): RSource =
+  def changeSource[F[_]](s: Source, coll: Ident): RSource =
     RSource(
       s.id,
       coll,
diff --git a/modules/store/src/main/scala/docspell/store/queries/QJob.scala b/modules/store/src/main/scala/docspell/store/queries/QJob.scala
index b120b0e0..41132ee6 100644
--- a/modules/store/src/main/scala/docspell/store/queries/QJob.scala
+++ b/modules/store/src/main/scala/docspell/store/queries/QJob.scala
@@ -1,7 +1,7 @@
 package docspell.store.queries
 
 import cats.data.NonEmptyList
-import cats.effect.Effect
+import cats.effect._
 import cats.implicits._
 import fs2.Stream
 
@@ -197,7 +197,7 @@ object QJob {
   def runningToWaiting[F[_]: Effect](workerId: Ident, store: Store[F]): F[Unit] =
     store.transact(RJob.setRunningToWaiting(workerId)).map(_ => ())
 
-  def findAll[F[_]: Effect](ids: Seq[Ident], store: Store[F]): F[Vector[RJob]] =
+  def findAll[F[_]](ids: Seq[Ident], store: Store[F]): F[Vector[RJob]] =
     store.transact(RJob.findFromIds(ids))
 
   def queueStateSnapshot(

From cfa36a52709a5780d3d028a39df43af7f007c61d Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Mon, 1 Mar 2021 00:33:57 +0100
Subject: [PATCH 3/3] Fix preview png tests

Outcome was checked manually.
---
 .../scala/docspell/extract/pdfbox/PdfboxPreviewTest.scala   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxPreviewTest.scala b/modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxPreviewTest.scala
index c07c4c64..19ded5ea 100644
--- a/modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxPreviewTest.scala
+++ b/modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxPreviewTest.scala
@@ -11,9 +11,9 @@ object PdfboxPreviewTest extends SimpleTestSuite {
   implicit val CS = TestFiles.CS
 
   val testPDFs = List(
-    ExampleFiles.letter_de_pdf     -> "83bdb379fe9ce86e830adfbe11238808bed9da6e31c1b66687d70b6b59a0d815",
-    ExampleFiles.letter_en_pdf     -> "699655a162c0c21dd9f19d8638f4e03811c6626a52bb30a1ac733d7fa5638932",
-    ExampleFiles.scanner_pdf13_pdf -> "a1680b80b42d8e04365ffd1e806ea2a8adb0492104cc41d8b40435b0fe4d4e65"
+    ExampleFiles.letter_de_pdf     -> "7d98be75b239816d6c751b3f3c56118ebf1a4632c43baf35a68a662f9d595ab8",
+    ExampleFiles.letter_en_pdf     -> "2bffbd01634525c6ce1fe477de23464e038055c4917afa41dd6186fe03a49f5b",
+    ExampleFiles.scanner_pdf13_pdf -> "05ce4fd686b3d24b0e2d60df0c6d79b1df2338fcf7a6957e34cb4d11c65682b4"
   )
 
   test("extract first page image from PDFs") {