From 3fabe0a5821768f2db67aa3ccb4f50729473a161 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Fri, 27 Nov 2020 20:26:24 +0100 Subject: [PATCH] Update to Scala 2.13.4 --- build.sbt | 10 ++++++---- .../src/main/scala/docspell/common/LenientUri.scala | 2 ++ .../scala/docspell/convert/extern/ExternConv.scala | 2 +- .../main/scala/docspell/joex/notify/MailContext.scala | 2 +- .../main/scala/docspell/store/records/RUserEmail.scala | 6 +++--- .../main/scala/docspell/store/records/RUserImap.scala | 6 +++--- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/build.sbt b/build.sbt index 88b9e48b..94827571 100644 --- a/build.sbt +++ b/build.sbt @@ -11,13 +11,13 @@ val elmCompileMode = settingKey[ElmCompileMode]("How to compile elm sources") val scalafixSettings = Seq( semanticdbEnabled := true, // enable SemanticDB - semanticdbVersion := scalafixSemanticdb.revision, //"4.3.10", // use Scalafix compatible version + semanticdbVersion := "4.4.0",//scalafixSemanticdb.revision ThisBuild / scalafixDependencies ++= Dependencies.organizeImports ) val sharedSettings = Seq( organization := "com.github.eikek", - scalaVersion := "2.13.3", + scalaVersion := "2.13.4", scalacOptions ++= Seq( "-deprecation", "-encoding", @@ -671,7 +671,8 @@ 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 + webext, + None ) val excludes = Seq(wx, target) @@ -688,7 +689,8 @@ 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 + archive, + None ) Seq(archive) diff --git a/modules/common/src/main/scala/docspell/common/LenientUri.scala b/modules/common/src/main/scala/docspell/common/LenientUri.scala index bb66d95d..600d0a61 100644 --- a/modules/common/src/main/scala/docspell/common/LenientUri.scala +++ b/modules/common/src/main/scala/docspell/common/LenientUri.scala @@ -211,6 +211,8 @@ object LenientUri { Right(LenientUri(nl, None, path, query, frag)) } } + case _ => + sys.error("Unreachable code") } } diff --git a/modules/convert/src/main/scala/docspell/convert/extern/ExternConv.scala b/modules/convert/src/main/scala/docspell/convert/extern/ExternConv.scala index c0212f09..e96075c2 100644 --- a/modules/convert/src/main/scala/docspell/convert/extern/ExternConv.scala +++ b/modules/convert/src/main/scala/docspell/convert/extern/ExternConv.scala @@ -83,7 +83,7 @@ private[extern] object ExternConv { case false => successPdf(File.readAll(out, blocker, chunkSize)).pure[F] } - case true if result.rc != 0 => + case true => logger.warn(s"Command not successful (rc=${result.rc}), but file exists.") *> successPdf(File.readAll(out, blocker, chunkSize)).pure[F] diff --git a/modules/joex/src/main/scala/docspell/joex/notify/MailContext.scala b/modules/joex/src/main/scala/docspell/joex/notify/MailContext.scala index 1713b80b..4f243521 100644 --- a/modules/joex/src/main/scala/docspell/joex/notify/MailContext.scala +++ b/modules/joex/src/main/scala/docspell/joex/notify/MailContext.scala @@ -53,7 +53,7 @@ object MailContext { case 1 => "**tomorrow**" case -1 => s"**yesterday**" case n if n > 0 => s"in $n days" - case n if n < 0 => s"${n * -1} days ago" + case n => s"${n * -1} days ago" } ItemData( i.id, diff --git a/modules/store/src/main/scala/docspell/store/records/RUserEmail.scala b/modules/store/src/main/scala/docspell/store/records/RUserEmail.scala index 34ab5936..270df3c0 100644 --- a/modules/store/src/main/scala/docspell/store/records/RUserEmail.scala +++ b/modules/store/src/main/scala/docspell/store/records/RUserEmail.scala @@ -175,9 +175,9 @@ object RUserEmail { val uLogin = RUser.Columns.login.prefix("u") val from = table ++ fr"m INNER JOIN" ++ RUser.table ++ fr"u ON" ++ mUid.is(uId) val cond = Seq(uColl.is(accId.collective), uLogin.is(accId.user)) ++ (nameQ match { - case Some(str) if exact => Seq(mName.is(str)) - case Some(str) if !exact => Seq(mName.lowerLike(s"%${str.toLowerCase}%")) - case None => Seq.empty + case Some(str) if exact => Seq(mName.is(str)) + case Some(str) => Seq(mName.lowerLike(s"%${str.toLowerCase}%")) + case None => Seq.empty }) (selectSimple(all.map(_.prefix("m")), from, and(cond)) ++ orderBy(mName.f)) diff --git a/modules/store/src/main/scala/docspell/store/records/RUserImap.scala b/modules/store/src/main/scala/docspell/store/records/RUserImap.scala index 5b56fe35..4babbe76 100644 --- a/modules/store/src/main/scala/docspell/store/records/RUserImap.scala +++ b/modules/store/src/main/scala/docspell/store/records/RUserImap.scala @@ -159,9 +159,9 @@ object RUserImap { val uLogin = RUser.Columns.login.prefix("u") val from = table ++ fr"m INNER JOIN" ++ RUser.table ++ fr"u ON" ++ mUid.is(uId) val cond = Seq(uColl.is(accId.collective), uLogin.is(accId.user)) ++ (nameQ match { - case Some(str) if exact => Seq(mName.is(str)) - case Some(str) if !exact => Seq(mName.lowerLike(s"%${str.toLowerCase}%")) - case None => Seq.empty + case Some(str) if exact => Seq(mName.is(str)) + case Some(str) => Seq(mName.lowerLike(s"%${str.toLowerCase}%")) + case None => Seq.empty }) (selectSimple(all.map(_.prefix("m")), from, and(cond)) ++ orderBy(mName.f))