TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-01 13:02:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to Scala 2.13.4

Browse Source
This commit is contained in:
Eike Kettner 2020-11-27 20:26:24 +01:00
parent 6243ef3b1c
commit 3fabe0a582
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.sbt
View File

@ -11,13 +11,13 @@ val elmCompileMode = settingKey[ElmCompileMode]("How to compile elm sources")
val scalafixSettings = Seq( val scalafixSettings = Seq(
semanticdbEnabled := true, // enable SemanticDB semanticdbEnabled := true, // enable SemanticDB
semanticdbVersion := scalafixSemanticdb.revision, //"4.3.10", // use Scalafix compatible version semanticdbVersion := "4.4.0",//scalafixSemanticdb.revision
ThisBuild / scalafixDependencies ++= Dependencies.organizeImports ThisBuild / scalafixDependencies ++= Dependencies.organizeImports
) )
val sharedSettings = Seq( val sharedSettings = Seq(
organization := "com.github.eikek", organization := "com.github.eikek",
scalaVersion := "2.13.3", scalaVersion := "2.13.4",
scalacOptions ++= Seq( scalacOptions ++= Seq(
"-deprecation", "-deprecation",
"-encoding", "-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 / "icons" / "logo-96.png" -> "icons/logo-96.png",
wx / "manifest.json" -> "manifest.json" wx / "manifest.json" -> "manifest.json"
), ),
webext webext,
None
) )
val excludes = Seq(wx, target) 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/app_manifest.json" -> s"docspell-tools-${version}/firefox/native/app_manifest.json",
wx / "native/native.py" -> s"docspell-tools-${version}/firefox/native/native.py" wx / "native/native.py" -> s"docspell-tools-${version}/firefox/native/native.py"
) ++ files, ) ++ files,
archive archive,
None
) )
Seq(archive) Seq(archive)

2
modules/common/src/main/scala/docspell/common/LenientUri.scala
View File

@ -211,6 +211,8 @@ object LenientUri {
Right(LenientUri(nl, None, path, query, frag)) Right(LenientUri(nl, None, path, query, frag))
} }
} }
case _ =>
sys.error("Unreachable code")
} }
} }

2
modules/convert/src/main/scala/docspell/convert/extern/ExternConv.scala vendored
View File

@ -83,7 +83,7 @@ private[extern] object ExternConv {
case false => case false =>
successPdf(File.readAll(out, blocker, chunkSize)).pure[F] 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.") *> logger.warn(s"Command not successful (rc=${result.rc}), but file exists.") *>
successPdf(File.readAll(out, blocker, chunkSize)).pure[F] successPdf(File.readAll(out, blocker, chunkSize)).pure[F]

2
modules/joex/src/main/scala/docspell/joex/notify/MailContext.scala
View File

@ -53,7 +53,7 @@ object MailContext {
case 1 => "**tomorrow**" case 1 => "**tomorrow**"
case -1 => s"**yesterday**" case -1 => s"**yesterday**"
case n if n > 0 => s"in $n days" 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( ItemData(
i.id, i.id,

6
modules/store/src/main/scala/docspell/store/records/RUserEmail.scala
View File

@ -175,9 +175,9 @@ object RUserEmail {
val uLogin = RUser.Columns.login.prefix("u") val uLogin = RUser.Columns.login.prefix("u")
val from = table ++ fr"m INNER JOIN" ++ RUser.table ++ fr"u ON" ++ mUid.is(uId) 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 { 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.is(str))
case Some(str) if !exact => Seq(mName.lowerLike(s"%${str.toLowerCase}%")) case Some(str) => Seq(mName.lowerLike(s"%${str.toLowerCase}%"))
case None => Seq.empty case None => Seq.empty
}) })
(selectSimple(all.map(_.prefix("m")), from, and(cond)) ++ orderBy(mName.f)) (selectSimple(all.map(_.prefix("m")), from, and(cond)) ++ orderBy(mName.f))

6
modules/store/src/main/scala/docspell/store/records/RUserImap.scala
View File

@ -159,9 +159,9 @@ object RUserImap {
val uLogin = RUser.Columns.login.prefix("u") val uLogin = RUser.Columns.login.prefix("u")
val from = table ++ fr"m INNER JOIN" ++ RUser.table ++ fr"u ON" ++ mUid.is(uId) 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 { 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.is(str))
case Some(str) if !exact => Seq(mName.lowerLike(s"%${str.toLowerCase}%")) case Some(str) => Seq(mName.lowerLike(s"%${str.toLowerCase}%"))
case None => Seq.empty case None => Seq.empty
}) })
(selectSimple(all.map(_.prefix("m")), from, and(cond)) ++ orderBy(mName.f)) (selectSimple(all.map(_.prefix("m")), from, and(cond)) ++ orderBy(mName.f))