From e6c2466b0c05b77f8a92bdab777c5ebc812c3ea9 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 21 Feb 2022 18:13:29 +0100 Subject: [PATCH 1/3] Update yamusca-circe, yamusca-core to 0.9.0 --- .../main/scala/docspell/joex/notify/YamuscaConverter.scala | 3 ++- .../src/main/scala/docspell/joex/updatecheck/MakeMail.scala | 3 ++- .../src/main/scala/docspell/restserver/webapp/Flags.scala | 5 +++-- .../scala/docspell/restserver/webapp/TemplateRoutes.scala | 5 +++-- project/Dependencies.scala | 5 +++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala b/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala index 19ed2690..8cf30e44 100644 --- a/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala +++ b/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala @@ -8,6 +8,7 @@ package docspell.joex.notify import docspell.common._ +import yamusca.derive._ import yamusca.implicits._ import yamusca.imports._ @@ -23,7 +24,7 @@ trait YamuscaConverter { ValueConverter.of(id => Value.fromString(id.id)) implicit val account: ValueConverter[AccountId] = - ValueConverter.deriveConverter[AccountId] + deriveValueConverter[AccountId] } diff --git a/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala b/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala index c7a5bb0b..88ffa5a7 100644 --- a/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala +++ b/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala @@ -15,6 +15,7 @@ import docspell.store.records.RUserEmail import emil._ import emil.builder._ import emil.markdown._ +import yamusca.derive._ import yamusca.implicits._ import yamusca.imports._ @@ -54,6 +55,6 @@ object MakeMail { TemplateCtx(thisVersion.get, release.version, release.published_at) implicit val yamuscaConverter: ValueConverter[TemplateCtx] = - ValueConverter.deriveConverter[TemplateCtx] + deriveValueConverter[TemplateCtx] } } diff --git a/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala b/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala index 393b2be8..fddbda4e 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala @@ -12,6 +12,7 @@ import docspell.restserver.{BuildInfo, Config} import io.circe._ import io.circe.generic.semiauto._ +import yamusca.derive._ import yamusca.implicits._ import yamusca.imports._ @@ -65,11 +66,11 @@ object Flags { implicit def yamuscaIdentConverter: ValueConverter[Ident] = ValueConverter.of(id => Value.fromString(id.id)) implicit def yamuscaOpenIdAuthConverter: ValueConverter[OpenIdAuth] = - ValueConverter.deriveConverter[OpenIdAuth] + deriveValueConverter[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] = - ValueConverter.deriveConverter[Flags] + deriveValueConverter[Flags] } diff --git a/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala index 43ed9a5b..4a26a2a4 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala @@ -22,6 +22,7 @@ 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._ @@ -115,7 +116,7 @@ object TemplateRoutes { ) implicit def yamuscaValueConverter: ValueConverter[DocData] = - ValueConverter.deriveConverter[DocData] + deriveValueConverter[DocData] } case class IndexData( @@ -148,7 +149,7 @@ object TemplateRoutes { Seq(s"/app/assets/docspell-webapp/${BuildInfo.version}/css/styles.css") implicit def yamuscaValueConverter: ValueConverter[IndexData] = - ValueConverter.deriveConverter[IndexData] + deriveValueConverter[IndexData] } private def memo[F[_]: Sync, A](fa: => F[A]): F[A] = { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 3c734a39..e7872b20 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -43,7 +43,7 @@ object Dependencies { val Slf4jVersion = "1.7.36" val StanfordNlpVersion = "4.4.0" val TikaVersion = "2.3.0" - val YamuscaVersion = "0.8.2" + val YamuscaVersion = "0.9.0" val SwaggerUIVersion = "4.5.0" val TestContainerVersion = "0.40.2" val TwelveMonkeysVersion = "3.8.1" @@ -294,7 +294,8 @@ object Dependencies { ) val yamusca = Seq( - "com.github.eikek" %% "yamusca-core" % YamuscaVersion + "com.github.eikek" %% "yamusca-core" % YamuscaVersion, + "com.github.eikek" %% "yamusca-derive" % YamuscaVersion ) val yamuscaCirce = Seq( "com.github.eikek" %% "yamusca-circe" % YamuscaVersion From e1c2f8cdc758694a0a3e446433b5cafb20312b03 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 22 Feb 2022 00:17:42 +0100 Subject: [PATCH 2/3] Revert commit(s) e6c2466b --- .../main/scala/docspell/joex/notify/YamuscaConverter.scala | 3 +-- .../src/main/scala/docspell/joex/updatecheck/MakeMail.scala | 3 +-- .../src/main/scala/docspell/restserver/webapp/Flags.scala | 5 ++--- .../scala/docspell/restserver/webapp/TemplateRoutes.scala | 5 ++--- project/Dependencies.scala | 5 ++--- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala b/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala index 8cf30e44..19ed2690 100644 --- a/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala +++ b/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala @@ -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] } diff --git a/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala b/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala index 88ffa5a7..c7a5bb0b 100644 --- a/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala +++ b/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala @@ -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] } } diff --git a/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala b/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala index fddbda4e..393b2be8 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala @@ -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] } diff --git a/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala index 4a26a2a4..43ed9a5b 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala @@ -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] = { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e7872b20..3c734a39 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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 From ece6b0354ff282c635e0957b0a77d79099fe3bd9 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 22 Feb 2022 00:17:46 +0100 Subject: [PATCH 3/3] Update yamusca-circe, yamusca-core to 0.9.0 --- .../main/scala/docspell/joex/notify/YamuscaConverter.scala | 3 ++- .../src/main/scala/docspell/joex/updatecheck/MakeMail.scala | 3 ++- .../src/main/scala/docspell/restserver/webapp/Flags.scala | 5 +++-- .../scala/docspell/restserver/webapp/TemplateRoutes.scala | 5 +++-- project/Dependencies.scala | 5 +++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala b/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala index 19ed2690..8cf30e44 100644 --- a/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala +++ b/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala @@ -8,6 +8,7 @@ package docspell.joex.notify import docspell.common._ +import yamusca.derive._ import yamusca.implicits._ import yamusca.imports._ @@ -23,7 +24,7 @@ trait YamuscaConverter { ValueConverter.of(id => Value.fromString(id.id)) implicit val account: ValueConverter[AccountId] = - ValueConverter.deriveConverter[AccountId] + deriveValueConverter[AccountId] } diff --git a/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala b/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala index c7a5bb0b..88ffa5a7 100644 --- a/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala +++ b/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala @@ -15,6 +15,7 @@ import docspell.store.records.RUserEmail import emil._ import emil.builder._ import emil.markdown._ +import yamusca.derive._ import yamusca.implicits._ import yamusca.imports._ @@ -54,6 +55,6 @@ object MakeMail { TemplateCtx(thisVersion.get, release.version, release.published_at) implicit val yamuscaConverter: ValueConverter[TemplateCtx] = - ValueConverter.deriveConverter[TemplateCtx] + deriveValueConverter[TemplateCtx] } } diff --git a/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala b/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala index 393b2be8..fddbda4e 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala @@ -12,6 +12,7 @@ import docspell.restserver.{BuildInfo, Config} import io.circe._ import io.circe.generic.semiauto._ +import yamusca.derive._ import yamusca.implicits._ import yamusca.imports._ @@ -65,11 +66,11 @@ object Flags { implicit def yamuscaIdentConverter: ValueConverter[Ident] = ValueConverter.of(id => Value.fromString(id.id)) implicit def yamuscaOpenIdAuthConverter: ValueConverter[OpenIdAuth] = - ValueConverter.deriveConverter[OpenIdAuth] + deriveValueConverter[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] = - ValueConverter.deriveConverter[Flags] + deriveValueConverter[Flags] } diff --git a/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala index 85a43fda..d3b24f28 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala @@ -21,6 +21,7 @@ import org.http4s._ import org.http4s.dsl.Http4sDsl import org.http4s.headers._ import org.http4s.implicits._ +import yamusca.derive._ import yamusca.implicits._ import yamusca.imports._ @@ -114,7 +115,7 @@ object TemplateRoutes { ) implicit def yamuscaValueConverter: ValueConverter[DocData] = - ValueConverter.deriveConverter[DocData] + deriveValueConverter[DocData] } case class IndexData( @@ -147,7 +148,7 @@ object TemplateRoutes { Seq(s"/app/assets/docspell-webapp/${BuildInfo.version}/css/styles.css") implicit def yamuscaValueConverter: ValueConverter[IndexData] = - ValueConverter.deriveConverter[IndexData] + deriveValueConverter[IndexData] } private def memo[F[_]: Sync, A](fa: => F[A]): F[A] = { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 28bf6aeb..a9fc8662 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -47,7 +47,7 @@ object Dependencies { val SourcecodeVersion = "0.2.8" val StanfordNlpVersion = "4.4.0" val TikaVersion = "2.3.0" - val YamuscaVersion = "0.8.2" + val YamuscaVersion = "0.9.0" val SwaggerUIVersion = "4.5.0" val TestContainerVersion = "0.40.2" val TwelveMonkeysVersion = "3.8.1" @@ -318,7 +318,8 @@ object Dependencies { ) val yamusca = Seq( - "com.github.eikek" %% "yamusca-core" % YamuscaVersion + "com.github.eikek" %% "yamusca-core" % YamuscaVersion, + "com.github.eikek" %% "yamusca-derive" % YamuscaVersion ) val yamuscaCirce = Seq( "com.github.eikek" %% "yamusca-circe" % YamuscaVersion