Fixing fansi/pprint dependency (#47)

* Fixing fansi/pprint dependency * scala 2 fix
zio · Feb 17, 2023 · 7797e98 · 7797e98
1 parent 398574f
commit 7797e98
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -17,7 +17,7 @@ object Dependencies {
 
   val ZioVersion = "2.0.6"
   val PPrintVersion = "0.6.6"
-  val FansiVersion = "0.4.0"
+  val FansiVersion = "0.2.14"
   val SourceCodeVersion = "0.2.8"
   val CompatVersion = "1.0.1"
   val CollectionCompatVersion = "2.9.0"
@@ -30,8 +30,8 @@ object Dependencies {
   val `zio-test-sbt`    = "dev.zio" %% "zio-test-sbt"    % ZioVersion % "test"
 
   val pprint            = ("com.lihaoyi" %% "pprint"      % PPrintVersion).excludeVersionConflicting
-  val fansi            = ("com.lihaoyi" %% "fansi"      % FansiVersion).excludeVersionConflicting
-  val sourcecode            = ("com.lihaoyi" %% "sourcecode"      % SourceCodeVersion).excludeVersionConflicting
+  val fansi             = ("com.lihaoyi" %% "fansi"      % FansiVersion).excludeVersionConflicting
+  val sourcecode        = ("com.lihaoyi" %% "sourcecode" % SourceCodeVersion).excludeVersionConflicting
 
   val `scala-java8-compat`    = "org.scala-lang.modules" %% "scala-java8-compat" % CompatVersion
   val `scala-collection-compat`    = "org.scala-lang.modules" %% "scala-collection-compat" % CollectionCompatVersion

diff --git a/zio-direct/src/main/scala-2.x/zio/direct/core/metaprog/WithPrintIR.scala b/zio-direct/src/main/scala-2.x/zio/direct/core/metaprog/WithPrintIR.scala
@@ -77,7 +77,7 @@ trait WithPrintIR extends MacroBase {
       }
 
     def apply(x: Any): fansi.Str = {
-      fansi.Str.join(this.tokenize(x).toSeq)
+      fansi.Str.join(this.tokenize(x).toSeq: _*)
     }
 
     def tokenize(x: Any): Iterator[fansi.Str] = {

diff --git a/zio-direct/src/main/scala-3.x/zio/direct/core/metaprog/WithPrintIR.scala b/zio-direct/src/main/scala-3.x/zio/direct/core/metaprog/WithPrintIR.scala
@@ -86,7 +86,7 @@ trait WithPrintIR {
       }
 
     def apply(x: Any): fansi.Str = {
-      fansi.Str.apply(this.tokenize(x).toSeq: _*)
+      fansi.Str.join(this.tokenize(x).toSeq: _*)
     }
 
     def tokenize(x: Any): Iterator[fansi.Str] = {

diff --git a/zio-direct/src/main/scala-3.x/zio/direct/core/metaprog/WithZioType.scala b/zio-direct/src/main/scala-3.x/zio/direct/core/metaprog/WithZioType.scala
@@ -1,8 +1,6 @@
 package zio.direct.core.metaprog
 
 import scala.quoted._
-import pprint._
-import fansi.Str
 import zio.direct.core.util.Format
 import zio.direct.Internal.Marker
 import zio.direct.core.metaprog.Extractors.Dealiased