Merge pull request #2947 from eikek/update-dependencies

mergify[bot] · web-flow · commit cf815789fca8 · 2025-02-04T22:04:18.000Z
Update dependencies
diff --git a/build.sbt b/build.sbt
@@ -15,7 +15,7 @@ val scalafixSettings = Seq(
 
 val sharedSettings = Seq(
   organization := "com.github.eikek",
-  scalaVersion := "2.13.14",
+  scalaVersion := "2.13.16",
   organizationName := "Eike K. & Contributors",
   licenses += (
     "AGPL-3.0-or-later",
@@ -681,7 +681,7 @@ val restapi = project
     openapiPackage := Pkg("docspell.restapi.model"),
     openapiSpec := (Compile / resourceDirectory).value / "docspell-openapi.yml",
     openapiStaticGen := OpenApiDocGenerator.Redoc,
-    openapiRedoclyCmd := Seq("redocly-cli"),
+    openapiRedoclyCmd := Seq("redocly"),
     openapiRedoclyConfig := Some(
       (LocalRootProject / baseDirectory).value / "project" / "redocly.yml"
     )
@@ -705,7 +705,7 @@ val joexapi = project
     openapiPackage := Pkg("docspell.joexapi.model"),
     openapiSpec := (Compile / resourceDirectory).value / "joex-openapi.yml",
     openapiStaticGen := OpenApiDocGenerator.Redoc,
-    openapiRedoclyCmd := Seq("redocly-cli"),
+    openapiRedoclyCmd := Seq("redocly"),
     openapiRedoclyConfig := Some(
       (LocalRootProject / baseDirectory).value / "project" / "redocly.yml"
     )
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "Docspell";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     devshell-tools.url = "github:eikek/devshell-tools";
     flake-utils.url = "github:numtide/flake-utils";
   };
@@ -24,7 +24,7 @@
         zola
         yarn
         nodejs
-        redocly-cli
+        redocly
         tailwindcss
       ];
       devshellPkgs =
diff --git a/modules/backend/src/main/scala/docspell/backend/ops/OFileRepository.scala b/modules/backend/src/main/scala/docspell/backend/ops/OFileRepository.scala
@@ -9,6 +9,7 @@ package docspell.backend.ops
 import cats.data.OptionT
 import cats.effect._
 import cats.implicits._
+import fs2.hashing.{HashAlgorithm, Hashing}
 
 import docspell.backend.JobFactory
 import docspell.backend.ops.OFileRepository.IntegrityResult
@@ -73,9 +74,10 @@ object OFileRepository {
               ) *>
                 store.fileRepo
                   .getBytes(key)
-                  .through(fs2.hash.sha256)
+                  .through(Hashing.forSync[F].hash(HashAlgorithm.SHA256))
+                  .map(_.bytes)
                   .compile
-                  .foldChunks(ByteVector.empty)(_ ++ _.toByteVector)
+                  .fold(ByteVector.empty)(_ ++ _.toByteVector)
             )
           res = IntegrityResult(expectedHash == actualHash, key)
           _ <- OptionT.liftF {
diff --git a/modules/common/src/main/scala/docspell/common/syntax/StreamSyntax.scala b/modules/common/src/main/scala/docspell/common/syntax/StreamSyntax.scala
@@ -9,6 +9,7 @@ package docspell.common.syntax
 import cats.effect.Sync
 import cats.implicits._
 import fs2.Stream
+import fs2.hashing.{HashAlgorithm, Hashing}
 
 import io.circe._
 import io.circe.parser._
@@ -29,9 +30,10 @@ trait StreamSyntax {
   implicit final class ByteStreamSyntax[F[_]](self: Stream[F, Byte]) {
     def sha256Hex(implicit F: Sync[F]): F[String] =
       self
-        .through(fs2.hash.sha256)
+        .through(Hashing.forSync[F].hash(HashAlgorithm.SHA256))
+        .map(_.bytes)
         .compile
-        .foldChunks(ByteVector.empty)(_ ++ _.toByteVector)
+        .fold(ByteVector.empty)(_ ++ _.toByteVector)
         .map(_.toHex)
   }
 }
diff --git a/modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxPreviewTest.scala b/modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxPreviewTest.scala
@@ -9,6 +9,7 @@ package docspell.extract.pdfbox
 import cats.effect._
 import cats.effect.unsafe.implicits.global
 import fs2.Stream
+import fs2.hashing.{HashAlgorithm, Hashing}
 import fs2.io.file.Files
 import fs2.io.file.Path
 
@@ -33,8 +34,8 @@ class PdfboxPreviewTest extends FunSuite with TestLoggingConfig {
           .eval(PdfboxPreview[IO](PreviewConfig(48)))
           .evalMap(_.previewPNG(data))
           .flatMap(_.get)
-          .through(fs2.hash.sha256)
-          .chunks
+          .through(Hashing.forSync[IO].hash(HashAlgorithm.SHA256))
+          .map(_.bytes)
           .map(_.toByteVector)
           .fold1(_ ++ _)
           .compile
diff --git a/modules/extract/src/test/scala/docspell/extract/poi/PoiExtractTest.scala b/modules/extract/src/test/scala/docspell/extract/poi/PoiExtractTest.scala
@@ -18,7 +18,7 @@ import munit._
 class PoiExtractTest extends FunSuite with TestLoggingConfig {
 
   val officeFiles = List(
-    ExampleFiles.examples_sample_doc -> 6241,
+    ExampleFiles.examples_sample_doc -> 6245,
     ExampleFiles.examples_sample_docx -> 6179,
     ExampleFiles.examples_sample_xlsx -> 660,
     ExampleFiles.examples_sample_xls -> 660
diff --git a/modules/fts-psql/src/test/scala/docspell/ftspsql/MigrationTest.scala b/modules/fts-psql/src/test/scala/docspell/ftspsql/MigrationTest.scala
@@ -24,7 +24,7 @@ class MigrationTest
     with TestContainerForAll
     with TestLoggingConfig {
   override val containerDef: PostgreSQLContainer.Def =
-    PostgreSQLContainer.Def(DockerImageName.parse("postgres:14"))
+    PostgreSQLContainer.Def(DockerImageName.parse("postgres:17"))
 
   override def docspellLogConfig: LogConfig =
     super.docspellLogConfig.docspellLevel(Level.Error)
diff --git a/modules/fts-psql/src/test/scala/docspell/ftspsql/PsqlFtsClientTest.scala b/modules/fts-psql/src/test/scala/docspell/ftspsql/PsqlFtsClientTest.scala
@@ -25,7 +25,7 @@ class PsqlFtsClientTest
     with TestContainerForAll
     with TestLoggingConfig {
   override val containerDef: PostgreSQLContainer.Def =
-    PostgreSQLContainer.Def(DockerImageName.parse("postgres:14"))
+    PostgreSQLContainer.Def(DockerImageName.parse("postgres:17"))
 
   val logger = docspell.logging.getLogger[IO]
 
diff --git a/modules/scheduler/impl/src/main/scala/docspell/scheduler/impl/QJob.scala b/modules/scheduler/impl/src/main/scala/docspell/scheduler/impl/QJob.scala
@@ -17,6 +17,7 @@ import docspell.store.qb._
 import docspell.store.records.{RJob, RJobGroupUse}
 
 import doobie.ConnectionIO
+import doobie.implicits._
 
 object QJob {
   private[this] val cioLogger = docspell.logging.getLogger[ConnectionIO]
diff --git a/modules/scheduler/impl/src/main/scala/docspell/scheduler/impl/QUserTask.scala b/modules/scheduler/impl/src/main/scala/docspell/scheduler/impl/QUserTask.scala
@@ -18,6 +18,7 @@ import docspell.store.records.RPeriodicTask
 
 import com.github.eikek.calev.CalEvent
 import doobie._
+import doobie.implicits._
 import io.circe.{Decoder, Encoder}
 
 object QUserTask {
diff --git a/modules/scheduler/impl/src/main/scala/docspell/scheduler/impl/SchedulerImpl.scala b/modules/scheduler/impl/src/main/scala/docspell/scheduler/impl/SchedulerImpl.scala
@@ -120,10 +120,9 @@ final class SchedulerImpl[F[_]: Async](
       .flatMap { state =>
         if (state.getRunning.isEmpty) Stream.eval(logger.info("No jobs running."))
         else
-          Stream.eval(
-            logger.info(s"Waiting for ${state.getRunning.size} jobs to finish.")
-          ) ++
-            Stream.emit(state)
+          Stream
+            .eval(logger.info(s"Waiting for ${state.getRunning.size} jobs to finish."))
+            .drain ++ Stream.emit(state)
       }
 
     (wait.drain ++ Stream.emit(())).compile.lastOrError
diff --git a/modules/store/src/main/resources/db/fixups/h2/V1.33.0__fix_reorganize_files.sql b/modules/store/src/main/resources/db/fixups/h2/V1.33.0__fix_reorganize_files.sql
@@ -34,14 +34,12 @@ create table obsolete_files(
   file_id varchar(254) not null
 );
 
-with
-  missing_ids as (
+insert into obsolete_files (file_id)
+  select file_id from filemeta
+  where file_id in (
     select file_id from filemeta
     except
     select file_id as file_id from valid_file_ids)
-insert into obsolete_files (file_id)
-  select file_id from filemeta
-  where file_id in (select file_id from missing_ids)
 ;
 
 
diff --git a/modules/store/src/main/resources/db/migration/h2/V1.33.0__reorganize_file_ids.sql b/modules/store/src/main/resources/db/migration/h2/V1.33.0__reorganize_file_ids.sql
@@ -78,17 +78,14 @@ create table obsolete_files(
   created timestamp not null
 );
 
-with
-  missing_ids as (
-    select file_id from filemeta
-    except
-    select original_file as file_id from file_migration_temp)
 insert into obsolete_files (file_id, mimetype, length, checksum, created)
   select file_id, mimetype, length, checksum, created from filemeta
-  where file_id in (select file_id from missing_ids)
+  where file_id in (select file_id from (
+    select file_id from filemeta
+    except
+    select original_file as file_id from file_migration_temp))
 ;
 
-
 -- duplicate each filemeta with the new id
 insert into filemeta (file_id, mimetype, length, checksum, created)
   select mm.new_file, fm.mimetype, fm.length, fm.checksum, fm.created
diff --git a/modules/store/src/main/resources/db/migration/h2/V1.39.1__file_meta_migration.sql b/modules/store/src/main/resources/db/migration/h2/V1.39.1__file_meta_migration.sql
@@ -22,13 +22,9 @@ create table "temp_file_ids"(
   new_id varchar(255) not null
 );
 
-with ids_orig(old_id, prefix) as
-  (select file_id, substring(file_id, 0, position('/' in file_id))
-   from filemeta fm
-  )
 insert into "temp_file_ids"
 select fm.old_id, tp.old_prefix, tp.new_prefix, replace(fm.old_id, tp.old_prefix, tp.new_prefix) as new_id
-from ids_orig fm
+from (select file_id as old_id, substring(file_id, 0, position('/' in file_id)) as prefix from filemeta) fm
 inner join "temp_prefixes" tp on fm.prefix = tp.old_prefix;
 
 -- remove orphaned files and chunks
diff --git a/modules/store/src/main/scala/docspell/store/migrate/FlywayMigrate.scala b/modules/store/src/main/scala/docspell/store/migrate/FlywayMigrate.scala
@@ -52,7 +52,7 @@ class FlywayMigrate[F[_]: Sync](
     if (!cfg.runMainMigrations)
       logger
         .info("Running main migrations is disabled!")
-        .as(new MigrateResult("", "", ""))
+        .as(new MigrateResult("", "", "", ""))
     else
       for {
         fw <- createFlyway(MigrationKind.Main)
diff --git a/modules/store/src/main/scala/docspell/store/queries/QAttachment.scala b/modules/store/src/main/scala/docspell/store/queries/QAttachment.scala
@@ -19,6 +19,7 @@ import docspell.store.qb._
 import docspell.store.records._
 
 import doobie._
+import doobie.implicits._
 
 object QAttachment {
   private val a = RAttachment.as("a")
diff --git a/modules/store/src/main/scala/docspell/store/queries/QCustomField.scala b/modules/store/src/main/scala/docspell/store/queries/QCustomField.scala
@@ -15,6 +15,7 @@ import docspell.store.qb._
 import docspell.store.records._
 
 import doobie._
+import doobie.implicits._
 
 object QCustomField {
   private val f = RCustomField.as("f")
diff --git a/modules/store/src/main/scala/docspell/store/queries/QJobQueue.scala b/modules/store/src/main/scala/docspell/store/queries/QJobQueue.scala
@@ -15,6 +15,7 @@ import docspell.store.qb._
 import docspell.store.records.{RJob, RJobLog}
 
 import doobie.ConnectionIO
+import doobie.implicits._
 
 object QJobQueue {
 
diff --git a/modules/store/src/main/scala/docspell/store/queries/QNotification.scala b/modules/store/src/main/scala/docspell/store/queries/QNotification.scala
@@ -17,6 +17,7 @@ import docspell.store.qb.Select
 import docspell.store.records._
 
 import doobie._
+import doobie.implicits._
 
 object QNotification {
 
diff --git a/modules/store/src/main/scala/docspell/store/records/RNotificationChannel.scala b/modules/store/src/main/scala/docspell/store/records/RNotificationChannel.scala
@@ -14,6 +14,7 @@ import docspell.notification.api.{Channel, ChannelRef, ChannelType}
 import docspell.store.qb.DSL._
 
 import doobie._
+import doobie.implicits._
 
 sealed trait RNotificationChannel {
 
diff --git a/modules/store/src/test/scala/docspell/store/DatabaseTest.scala b/modules/store/src/test/scala/docspell/store/DatabaseTest.scala
@@ -33,11 +33,11 @@ trait DatabaseTest
   val cio: Sync[ConnectionIO] = Sync[ConnectionIO]
 
   lazy val mariadbCnt = ForAllContainerFixture(
-    MariaDBContainer.Def(DockerImageName.parse("mariadb:10.5")).createContainer()
+    MariaDBContainer.Def(DockerImageName.parse("mariadb:11")).createContainer()
   )
 
   lazy val postgresCnt = ForAllContainerFixture(
-    PostgreSQLContainer.Def(DockerImageName.parse("postgres:14")).createContainer()
+    PostgreSQLContainer.Def(DockerImageName.parse("postgres:17")).createContainer()
   )
 
   lazy val pgDataSource = ResourceSuiteLocalFixture(
diff --git a/modules/store/src/test/scala/docspell/store/StoreFixture.scala b/modules/store/src/test/scala/docspell/store/StoreFixture.scala
diff --git a/modules/store/src/test/scala/docspell/store/fts/TempFtsOpsTest.scala b/modules/store/src/test/scala/docspell/store/fts/TempFtsOpsTest.scala
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
diff --git a/project/build.sbt b/project/build.sbt
diff --git a/project/plugins.sbt b/project/plugins.sbt
