From 4b0eb650f2bd93c524d4b4a673735070cf354cef Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Mon, 25 May 2020 16:21:56 +0200
Subject: [PATCH] Rename package to avoid name clashes

---
 .../docspell/common/{pureconfig => config}/Implicits.scala  | 6 +++---
 modules/joex/src/main/scala/docspell/joex/ConfigFile.scala  | 6 +++---
 .../src/main/scala/docspell/restserver/ConfigFile.scala     | 6 +++---
 .../src/main/scala/docspell/restserver/webapp/Flags.scala   | 4 ++--
 .../scala/docspell/restserver/webapp/TemplateRoutes.scala   | 6 +++---
 .../main/scala/docspell/store/usertask/UserTaskStore.scala  | 4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename modules/common/src/main/scala/docspell/common/{pureconfig => config}/Implicits.scala (92%)

diff --git a/modules/common/src/main/scala/docspell/common/pureconfig/Implicits.scala b/modules/common/src/main/scala/docspell/common/config/Implicits.scala
similarity index 92%
rename from modules/common/src/main/scala/docspell/common/pureconfig/Implicits.scala
rename to modules/common/src/main/scala/docspell/common/config/Implicits.scala
index b6b3754d..2a6619e4 100644
--- a/modules/common/src/main/scala/docspell/common/pureconfig/Implicits.scala
+++ b/modules/common/src/main/scala/docspell/common/config/Implicits.scala
@@ -1,8 +1,8 @@
-package docspell.common.pureconfig
+package docspell.common.config
 
 import docspell.common._
-import _root_.pureconfig._
-import _root_.pureconfig.error.{CannotConvert, FailureReason}
+import pureconfig._
+import pureconfig.error.{CannotConvert, FailureReason}
 import scodec.bits.ByteVector
 import com.github.eikek.calev.CalEvent
 
diff --git a/modules/joex/src/main/scala/docspell/joex/ConfigFile.scala b/modules/joex/src/main/scala/docspell/joex/ConfigFile.scala
index e399a7c9..647fde6d 100644
--- a/modules/joex/src/main/scala/docspell/joex/ConfigFile.scala
+++ b/modules/joex/src/main/scala/docspell/joex/ConfigFile.scala
@@ -1,8 +1,8 @@
 package docspell.joex
 
-import docspell.common.pureconfig.Implicits._
-import _root_.pureconfig._
-import _root_.pureconfig.generic.auto._
+import docspell.common.config.Implicits._
+import pureconfig._
+import pureconfig.generic.auto._
 import docspell.joex.scheduler.CountingScheme
 
 object ConfigFile {
diff --git a/modules/restserver/src/main/scala/docspell/restserver/ConfigFile.scala b/modules/restserver/src/main/scala/docspell/restserver/ConfigFile.scala
index d7925ef3..df1584e1 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/ConfigFile.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/ConfigFile.scala
@@ -1,9 +1,9 @@
 package docspell.restserver
 
-import docspell.common.pureconfig.Implicits._
+import docspell.common.config.Implicits._
 import docspell.backend.signup.{Config => SignupConfig}
-import _root_.pureconfig._
-import _root_.pureconfig.generic.auto._
+import pureconfig._
+import pureconfig.generic.auto._
 
 object ConfigFile {
   import Implicits._
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 3326a839..0dea6b6f 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala
@@ -1,7 +1,7 @@
 package docspell.restserver.webapp
 
-import _root_.io.circe._
-import _root_.io.circe.generic.semiauto._
+import io.circe._
+import io.circe.generic.semiauto._
 import docspell.common.LenientUri
 import docspell.restserver.{BuildInfo, Config}
 import docspell.backend.signup.{Config => SignupConfig}
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 70976688..6686ce7f 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala
@@ -1,6 +1,6 @@
 package docspell.restserver.webapp
 
-import fs2._
+import fs2.{Stream, text}
 import cats.effect._
 import cats.implicits._
 import org.http4s._
@@ -8,7 +8,7 @@ import org.http4s.headers._
 import org.http4s.HttpRoutes
 import org.http4s.dsl.Http4sDsl
 import org.log4s._
-import _root_.io.circe.syntax._
+import io.circe.syntax._
 import yamusca.imports._
 import yamusca.implicits._
 import java.net.URL
@@ -69,7 +69,7 @@ object TemplateRoutes {
   ): F[String] =
     Stream
       .bracket(Sync[F].delay(url.openStream))(in => Sync[F].delay(in.close()))
-      .flatMap(in => io.readInputStream(in.pure[F], 64 * 1024, blocker, false))
+      .flatMap(in => fs2.io.readInputStream(in.pure[F], 64 * 1024, blocker, false))
       .through(text.utf8Decode)
       .compile
       .fold("")(_ + _)
diff --git a/modules/store/src/main/scala/docspell/store/usertask/UserTaskStore.scala b/modules/store/src/main/scala/docspell/store/usertask/UserTaskStore.scala
index d1e9690c..9f9c430a 100644
--- a/modules/store/src/main/scala/docspell/store/usertask/UserTaskStore.scala
+++ b/modules/store/src/main/scala/docspell/store/usertask/UserTaskStore.scala
@@ -1,10 +1,10 @@
 package docspell.store.usertask
 
-import fs2._
+import fs2.Stream
 import cats.implicits._
 import cats.effect._
 import cats.data.OptionT
-import _root_.io.circe._
+import io.circe._
 import docspell.common._
 import docspell.store.{AddResult, Store}
 import docspell.store.queries.QUserTask