diff --git a/.scalafmt.conf b/.scalafmt.conf index 8d03522a..2428ca65 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.5.2" +version = "3.5.8" preset = default align.preset = some diff --git a/modules/backend/src/main/scala/docspell/backend/joex/AddonPrepare.scala b/modules/backend/src/main/scala/docspell/backend/joex/AddonPrepare.scala index 03ab223d..fb14e77b 100644 --- a/modules/backend/src/main/scala/docspell/backend/joex/AddonPrepare.scala +++ b/modules/backend/src/main/scala/docspell/backend/joex/AddonPrepare.scala @@ -23,13 +23,19 @@ import scodec.bits.ByteVector private[joex] class AddonPrepare[F[_]: Sync](store: Store[F]) extends LoggerExtension { def logResult(logger: Logger[F], ref: AddonRunConfigRef): Middleware[F] = - Middleware(_.mapF(_.attempt.flatTap { - case Right(_) => ().pure[F] - case Left(ex) => - logger - .withRunConfig(ref) - .warn(ex)(s"Addon task '${ref.id.id}' has failed") - }.rethrow)) + Middleware( + _.mapF( + _.attempt + .flatTap { + case Right(_) => ().pure[F] + case Left(ex) => + logger + .withRunConfig(ref) + .warn(ex)(s"Addon task '${ref.id.id}' has failed") + } + .rethrow + ) + ) /** Creates environment variables for dsc to connect to the docspell server for the * given run config. diff --git a/modules/query/shared/src/main/scala/docspell/query/internal/StringUtil.scala b/modules/query/shared/src/main/scala/docspell/query/internal/StringUtil.scala index 36ff25f9..3488c721 100644 --- a/modules/query/shared/src/main/scala/docspell/query/internal/StringUtil.scala +++ b/modules/query/shared/src/main/scala/docspell/query/internal/StringUtil.scala @@ -123,7 +123,7 @@ object StringUtil { catch { case _: NumberFormatException => ~idx } sb.append(asInt.toChar) end - } else ~(str.length) + } else ~str.length } @annotation.tailrec def loop(idx: Int): Int = diff --git a/modules/scheduler/impl/src/main/scala/docspell/scheduler/impl/PeriodicSchedulerImpl.scala b/modules/scheduler/impl/src/main/scala/docspell/scheduler/impl/PeriodicSchedulerImpl.scala index d76aa461..ada53b9d 100644 --- a/modules/scheduler/impl/src/main/scala/docspell/scheduler/impl/PeriodicSchedulerImpl.scala +++ b/modules/scheduler/impl/src/main/scala/docspell/scheduler/impl/PeriodicSchedulerImpl.scala @@ -163,7 +163,7 @@ final class PeriodicSchedulerImpl[F[_]: Async]( private def logThrow[A](msg: => String)(fa: F[A]): F[A] = fa.attempt.flatMap { case r @ Right(_) => (r: Either[Throwable, A]).pure[F] - case l @ Left(ex) => logger.error(ex)(msg).map(_ => (l: Either[Throwable, A])) + case l @ Left(ex) => logger.error(ex)(msg).map(_ => l: Either[Throwable, A]) }.rethrow } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ec11cd62..5c88615b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -13,14 +13,14 @@ object Dependencies { val CatsEffectVersion = "3.3.12" val CatsParseVersion = "0.3.7" val CirceVersion = "0.14.2" - val CirceGenericExtrasVersion = "0.14.1" + val CirceGenericExtrasVersion = "0.14.2" val CirceYamlVersion = "0.14.1" val ClipboardJsVersion = "2.0.6" val DoobieVersion = "1.0.0-RC2" val EmilVersion = "0.12.0" val FlexmarkVersion = "0.64.0" - val FlywayVersion = "8.5.11" - val Fs2Version = "3.2.7" + val FlywayVersion = "8.5.12" + val Fs2Version = "3.2.8" val H2Version = "1.4.200" val Http4sVersion = "0.23.12" val Icu4jVersion = "71.1" @@ -32,16 +32,16 @@ object Dependencies { val LevigoJbig2Version = "2.0" val Log4sVersion = "1.10.0" val LogbackVersion = "1.2.10" - val MariaDbVersion = "3.0.4" + val MariaDbVersion = "3.0.5" val MUnitVersion = "0.7.29" val MUnitCatsEffectVersion = "1.0.7" val OrganizeImportsVersion = "0.6.0" val PdfboxVersion = "2.0.26" val PdfjsViewerVersion = "2.9.359" val PoiVersion = "4.1.2" - val PostgresVersion = "42.3.6" + val PostgresVersion = "42.4.0" val PureConfigVersion = "0.17.1" - val ScalaJavaTimeVersion = "2.3.0" + val ScalaJavaTimeVersion = "2.4.0" val ScodecBitsVersion = "1.1.31" val ScribeVersion = "3.8.3" val Slf4jVersion = "1.7.36" @@ -50,7 +50,7 @@ object Dependencies { val TikaVersion = "2.4.0" val YamuscaVersion = "0.9.0" val SwaggerUIVersion = "4.11.1" - val TestContainerVersion = "0.40.7" + val TestContainerVersion = "0.40.8" val TwelveMonkeysVersion = "3.8.2" val JQueryVersion = "3.5.1" diff --git a/project/plugins.sbt b/project/plugins.sbt index 1f471368..a54a74ff 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.0") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.1") 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")