Adopt to new loggin api

build.sbt

@@ -9,9 +9,6 @@ val elmCompileMode = settingKey[ElmCompileMode]("How to compile elm sources")
 
 // --- Settings
 
-def inTest(d0: Seq[ModuleID], ds: Seq[ModuleID]*) =
-  ds.fold(d0)(_ ++ _).map(_ % Test)
-
 val scalafixSettings = Seq(
   semanticdbEnabled := true, // enable SemanticDB
   semanticdbVersion := scalafixSemanticdb.revision, // "4.4.0"
@@ -58,14 +55,10 @@ val sharedSettings = Seq(
   libraryDependencySchemes ++= Seq(
     "com.github.eikek" %% "calev-core" % VersionScheme.Always,
     "com.github.eikek" %% "calev-circe" % VersionScheme.Always
-  )
+  ),
+  addCompilerPlugin(Dependencies.kindProjectorPlugin)
 ) ++ scalafixSettings
 
-val testSettingsMUnit = Seq(
-  libraryDependencies ++= inTest(Dependencies.munit, Dependencies.logging),
-  testFrameworks += new TestFramework("munit.Framework")
-)
-
 lazy val noPublish = Seq(
   publish := {},
   publishLocal := {},
@@ -294,6 +287,20 @@ val openapiScalaSettings = Seq(
 
 // --- Modules
 
+val loggingApi = project
+  .in(file("modules/logging/api"))
+  .disablePlugins(RevolverPlugin)
+  .settings(sharedSettings)
+  .withTestSettings
+  .settings(
+    name := "docspell-logging-api",
+    libraryDependencies ++=
+      Dependencies.catsEffect ++
+        Dependencies.circeCore ++
+        Dependencies.fs2Core ++
+        Dependencies.sourcecode
+  )
+
 // Base module, everything depends on this – including restapi and
 // joexapi modules. This should aim to have least possible
 // dependencies
@@ -301,44 +308,44 @@ val common = project
   .in(file("modules/common"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-common",
-    addCompilerPlugin(Dependencies.kindProjectorPlugin),
     libraryDependencies ++=
       Dependencies.fs2 ++
         Dependencies.circe ++
-        Dependencies.loggingApi ++
         Dependencies.calevCore ++
         Dependencies.calevCirce
   )
-
-val logging = project
-  .in(file("modules/logging"))
-  .disablePlugins(RevolverPlugin)
-  .settings(sharedSettings)
-  .settings(testSettingsMUnit)
-  .settings(
-    name := "docspell-logging",
-    libraryDependencies ++=
-      Dependencies.scribe ++
-        Dependencies.catsEffect ++
-        Dependencies.circeCore
-  )
+  .dependsOn(loggingApi)
 
 val config = project
   .in(file("modules/config"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-config",
-    addCompilerPlugin(Dependencies.kindProjectorPlugin),
     libraryDependencies ++=
       Dependencies.fs2 ++
         Dependencies.pureconfig
   )
-  .dependsOn(common)
+  .dependsOn(common, loggingApi)
+
+val loggingScribe = project
+  .in(file("modules/logging/scribe"))
+  .disablePlugins(RevolverPlugin)
+  .settings(sharedSettings)
+  .withTestSettings
+  .settings(
+    name := "docspell-logging-scribe",
+    libraryDependencies ++=
+      Dependencies.scribe ++
+        Dependencies.catsEffect ++
+        Dependencies.circeCore ++
+        Dependencies.fs2Core
+  )
+  .dependsOn(loggingApi)
 
 // Some example files for testing
 // https://file-examples.com/index.php/sample-documents-download/sample-doc-download/
@@ -346,7 +353,7 @@ val files = project
   .in(file("modules/files"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-files",
     libraryDependencies ++=
@@ -385,7 +392,7 @@ val query =
     .in(file("modules/query"))
     .disablePlugins(RevolverPlugin)
     .settings(sharedSettings)
-    .settings(testSettingsMUnit)
+    .withTestSettings
     .settings(
       name := "docspell-query",
       libraryDependencies +=
@@ -405,7 +412,7 @@ val totp = project
   .in(file("modules/totp"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-totp",
     libraryDependencies ++=
@@ -419,7 +426,7 @@ val jsonminiq = project
   .in(file("modules/jsonminiq"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-jsonminiq",
     libraryDependencies ++=
@@ -432,25 +439,23 @@ val notificationApi = project
   .in(file("modules/notification/api"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-notification-api",
-    addCompilerPlugin(Dependencies.kindProjectorPlugin),
     libraryDependencies ++=
       Dependencies.fs2 ++
         Dependencies.emilCommon ++
         Dependencies.circeGenericExtra
   )
-  .dependsOn(common)
+  .dependsOn(common, loggingScribe)
 
 val store = project
   .in(file("modules/store"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-store",
-    addCompilerPlugin(Dependencies.kindProjectorPlugin),
     libraryDependencies ++=
       Dependencies.doobie ++
         Dependencies.binny ++
@@ -466,16 +471,15 @@ val store = project
     libraryDependencies ++=
       Dependencies.testContainer.map(_ % Test)
   )
-  .dependsOn(common, query.jvm, totp, files, notificationApi, jsonminiq)
+  .dependsOn(common, query.jvm, totp, files, notificationApi, jsonminiq, loggingScribe)
 
 val notificationImpl = project
   .in(file("modules/notification/impl"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-notification-impl",
-    addCompilerPlugin(Dependencies.kindProjectorPlugin),
     libraryDependencies ++=
       Dependencies.fs2 ++
         Dependencies.emil ++
@@ -492,10 +496,9 @@ val pubsubApi = project
   .in(file("modules/pubsub/api"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-pubsub-api",
-    addCompilerPlugin(Dependencies.kindProjectorPlugin),
     libraryDependencies ++=
       Dependencies.fs2
   )
@@ -505,10 +508,9 @@ val pubsubNaive = project
   .in(file("modules/pubsub/naive"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-pubsub-naive",
-    addCompilerPlugin(Dependencies.kindProjectorPlugin),
     libraryDependencies ++=
       Dependencies.fs2 ++
         Dependencies.http4sCirce ++
@@ -522,7 +524,7 @@ val extract = project
   .in(file("modules/extract"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-extract",
     libraryDependencies ++=
@@ -533,13 +535,13 @@ val extract = project
         Dependencies.commonsIO ++
         Dependencies.julOverSlf4j
   )
-  .dependsOn(common, files % "compile->compile;test->test")
+  .dependsOn(common, loggingScribe, files % "compile->compile;test->test")
 
 val convert = project
   .in(file("modules/convert"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-convert",
     libraryDependencies ++=
@@ -554,7 +556,7 @@ val analysis = project
   .disablePlugins(RevolverPlugin)
   .enablePlugins(NerModelsPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(NerModelsPlugin.nerClassifierSettings)
   .settings(
     name := "docspell-analysis",
@@ -562,24 +564,24 @@ val analysis = project
       Dependencies.fs2 ++
         Dependencies.stanfordNlpCore
   )
-  .dependsOn(common, files % "test->test")
+  .dependsOn(common, files % "test->test", loggingScribe)
 
 val ftsclient = project
   .in(file("modules/fts-client"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-fts-client",
     libraryDependencies ++= Seq.empty
   )
-  .dependsOn(common)
+  .dependsOn(common, loggingScribe)
 
 val ftssolr = project
   .in(file("modules/fts-solr"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-fts-solr",
     libraryDependencies ++=
@@ -595,7 +597,7 @@ val restapi = project
   .disablePlugins(RevolverPlugin)
   .enablePlugins(OpenApiSchema)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(openapiScalaSettings)
   .settings(
     name := "docspell-restapi",
@@ -613,7 +615,7 @@ val joexapi = project
   .disablePlugins(RevolverPlugin)
   .enablePlugins(OpenApiSchema)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(openapiScalaSettings)
   .settings(
     name := "docspell-joexapi",
@@ -626,13 +628,13 @@ val joexapi = project
     openapiSpec := (Compile / resourceDirectory).value / "joex-openapi.yml",
     openapiStaticGen := OpenApiDocGenerator.Redoc
   )
-  .dependsOn(common)
+  .dependsOn(common, loggingScribe)
 
 val backend = project
   .in(file("modules/backend"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-backend",
     libraryDependencies ++=
@@ -642,13 +644,13 @@ val backend = project
         Dependencies.http4sClient ++
         Dependencies.emil
   )
-  .dependsOn(store, notificationApi, joexapi, ftsclient, totp, pubsubApi)
+  .dependsOn(store, notificationApi, joexapi, ftsclient, totp, pubsubApi, loggingApi)
 
 val oidc = project
   .in(file("modules/oidc"))
   .disablePlugins(RevolverPlugin)
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(
     name := "docspell-oidc",
     libraryDependencies ++=
@@ -660,7 +662,7 @@ val oidc = project
         Dependencies.circe ++
         Dependencies.jwtScala
   )
-  .dependsOn(common)
+  .dependsOn(common, loggingScribe)
 
 val webapp = project
   .in(file("modules/webapp"))
@@ -691,7 +693,7 @@ val joex = project
     ClasspathJarPlugin
   )
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(debianSettings("docspell-joex"))
   .settings(buildInfoSettings)
   .settings(
@@ -714,7 +716,6 @@ val joex = project
         Dependencies.yamusca ++
         Dependencies.loggingApi ++
         Dependencies.logging.map(_ % Runtime),
-    addCompilerPlugin(Dependencies.kindProjectorPlugin),
     addCompilerPlugin(Dependencies.betterMonadicFor),
     buildInfoPackage := "docspell.joex",
     reStart / javaOptions ++= Seq(
@@ -726,6 +727,8 @@ val joex = project
   )
   .dependsOn(
     config,
+    loggingApi,
+    loggingScribe,
     store,
     backend,
     extract,
@@ -748,7 +751,7 @@ val restserver = project
     ClasspathJarPlugin
   )
   .settings(sharedSettings)
-  .settings(testSettingsMUnit)
+  .withTestSettings
   .settings(debianSettings("docspell-server"))
   .settings(buildInfoSettings)
   .settings(
@@ -767,7 +770,6 @@ val restserver = project
         Dependencies.webjars ++
         Dependencies.loggingApi ++
         Dependencies.logging.map(_ % Runtime),
-    addCompilerPlugin(Dependencies.kindProjectorPlugin),
     addCompilerPlugin(Dependencies.betterMonadicFor),
     buildInfoPackage := "docspell.restserver",
     Compile / sourceGenerators += Def.task {
@@ -801,6 +803,8 @@ val restserver = project
   )
   .dependsOn(
     config,
+    loggingApi,
+    loggingScribe,
     restapi,
     joexapi,
     backend,
@@ -882,7 +886,8 @@ val root = project
   )
   .aggregate(
     common,
-    logging,
+    loggingApi,
+    loggingScribe,
     config,
     extract,
     convert,