TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 10:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert commit(s) e6c2466b

Browse Source
This commit is contained in:
Scala Steward 2022-02-22 00:17:42 +01:00
parent e6c2466b0c
commit e1c2f8cdc7
No known key found for this signature in database
GPG Key ID: 96BDF10FFAB8B6A6
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala
View File

@ -8,7 +8,6 @@ package docspell.joex.notify
import docspell.common._
import yamusca.derive._
import yamusca.implicits._
import yamusca.imports._
@ -24,7 +23,7 @@ trait YamuscaConverter {
ValueConverter.of(id => Value.fromString(id.id))
implicit val account: ValueConverter[AccountId] =
deriveValueConverter[AccountId]
ValueConverter.deriveConverter[AccountId]
}

3
modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala
View File

@ -15,7 +15,6 @@ import docspell.store.records.RUserEmail
import emil._
import emil.builder._
import emil.markdown._
import yamusca.derive._
import yamusca.implicits._
import yamusca.imports._
@ -55,6 +54,6 @@ object MakeMail {
TemplateCtx(thisVersion.get, release.version, release.published_at)
implicit val yamuscaConverter: ValueConverter[TemplateCtx] =
deriveValueConverter[TemplateCtx]
ValueConverter.deriveConverter[TemplateCtx]
}
}

5
modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala
View File

@ -12,7 +12,6 @@ import docspell.restserver.{BuildInfo, Config}
import io.circe._
import io.circe.generic.semiauto._
import yamusca.derive._
import yamusca.implicits._
import yamusca.imports._
@ -66,11 +65,11 @@ object Flags {
implicit def yamuscaIdentConverter: ValueConverter[Ident] =
ValueConverter.of(id => Value.fromString(id.id))
implicit def yamuscaOpenIdAuthConverter: ValueConverter[OpenIdAuth] =
deriveValueConverter[OpenIdAuth]
ValueConverter.deriveConverter[OpenIdAuth]
implicit def yamuscaSignupModeConverter: ValueConverter[SignupConfig.Mode] =
ValueConverter.of(m => Value.fromString(m.name))
implicit def yamuscaUriConverter: ValueConverter[LenientUri] =
ValueConverter.of(uri => Value.fromString(uri.asString))
implicit def yamuscaValueConverter: ValueConverter[Flags] =
deriveValueConverter[Flags]
ValueConverter.deriveConverter[Flags]
}

5
modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala
View File

@ -22,7 +22,6 @@ import org.http4s.dsl.Http4sDsl
import org.http4s.headers._
import org.http4s.implicits._
import org.log4s._
import yamusca.derive._
import yamusca.implicits._
import yamusca.imports._
@ -116,7 +115,7 @@ object TemplateRoutes {
)
implicit def yamuscaValueConverter: ValueConverter[DocData] =
deriveValueConverter[DocData]
ValueConverter.deriveConverter[DocData]
}
case class IndexData(
@ -149,7 +148,7 @@ object TemplateRoutes {
Seq(s"/app/assets/docspell-webapp/${BuildInfo.version}/css/styles.css")
implicit def yamuscaValueConverter: ValueConverter[IndexData] =
deriveValueConverter[IndexData]
ValueConverter.deriveConverter[IndexData]
}
private def memo[F[_]: Sync, A](fa: => F[A]): F[A] = {

5
project/Dependencies.scala
View File

@ -43,7 +43,7 @@ object Dependencies {
val Slf4jVersion = "1.7.36"
val StanfordNlpVersion = "4.4.0"
val TikaVersion = "2.3.0"
val YamuscaVersion = "0.9.0"
val YamuscaVersion = "0.8.2"
val SwaggerUIVersion = "4.5.0"
val TestContainerVersion = "0.40.2"
val TwelveMonkeysVersion = "3.8.1"
@ -294,8 +294,7 @@ object Dependencies {
)
val yamusca = Seq(
"com.github.eikek" %% "yamusca-core" % YamuscaVersion,
"com.github.eikek" %% "yamusca-derive" % YamuscaVersion
"com.github.eikek" %% "yamusca-core" % YamuscaVersion
)
val yamuscaCirce = Seq(
"com.github.eikek" %% "yamusca-circe" % YamuscaVersion