From 84612bc7e7aa7d9304b333ff7fe84da0d317c9fc Mon Sep 17 00:00:00 2001
From: eikek <eike.kettner@posteo.de>
Date: Sun, 5 Nov 2023 23:23:05 +0100
Subject: [PATCH] Update scribe

---
 .../main/scala/docspell/logging/impl/Record.scala   |  2 +-
 .../scala/docspell/logging/impl/ScribeWrapper.scala | 13 ++++++++-----
 project/Dependencies.scala                          |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/logging/scribe/src/main/scala/docspell/logging/impl/Record.scala b/modules/logging/scribe/src/main/scala/docspell/logging/impl/Record.scala
index 165b2333..dc57fe64 100644
--- a/modules/logging/scribe/src/main/scala/docspell/logging/impl/Record.scala
+++ b/modules/logging/scribe/src/main/scala/docspell/logging/impl/Record.scala
@@ -12,7 +12,7 @@ import io.circe.syntax._
 import io.circe.{Encoder, Json}
 import perfolation._
 import scribe.LogRecord
-import scribe.data.MDC
+import scribe.mdc.MDC
 import scribe.message.Message
 
 // From: https://github.com/outr/scribe/blob/8e99521e1ee1f0c421629764dd96e4eb193d84bd/json/shared/src/main/scala/scribe/json/JsonWriter.scala
diff --git a/modules/logging/scribe/src/main/scala/docspell/logging/impl/ScribeWrapper.scala b/modules/logging/scribe/src/main/scala/docspell/logging/impl/ScribeWrapper.scala
index 49bf07d8..c2b159c3 100644
--- a/modules/logging/scribe/src/main/scala/docspell/logging/impl/ScribeWrapper.scala
+++ b/modules/logging/scribe/src/main/scala/docspell/logging/impl/ScribeWrapper.scala
@@ -12,7 +12,7 @@ import cats.effect.Sync
 import docspell.logging.{Level, LogEvent, Logger}
 
 import scribe.LoggerSupport
-import scribe.data.{MDC, MDCMap}
+import scribe.mdc.{MDC, MDCMap}
 import scribe.message.LoggableMessage
 
 private[logging] object ScribeWrapper {
@@ -44,10 +44,13 @@ private[logging] object ScribeWrapper {
 
   private[this] def convert(ev: LogEvent) = {
     val level = convertLevel(ev.level)
-    val additional: List[LoggableMessage] = ev.additional.map {
-      case Right(ex) => LoggableMessage.throwable2Message(ex)
-      case Left(msg) => LoggableMessage.string2Message(msg)
-    }.toList
+    val additional: List[LoggableMessage] = ev.additional
+      .map {
+        case Right(ex) => LoggableMessage.throwableList2Messages(List(ex))
+        case Left(msg) => LoggableMessage.stringList2Messages(List(msg))
+      }
+      .toList
+      .flatten
     LoggerSupport(
       level,
       ev.msg() :: additional,
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index dd036bd6..1ad4ce5f 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -42,7 +42,7 @@ object Dependencies {
   val PureConfigVersion = "0.17.4"
   val ScalaJavaTimeVersion = "2.5.0"
   val ScodecBitsVersion = "1.1.38"
-  val ScribeVersion = "3.11.9"
+  val ScribeVersion = "3.12.2"
   val Slf4jVersion = "2.0.9"
   val SourcecodeVersion = "0.3.1"
   val StanfordNlpVersion = "4.5.5"