put circe-yaml fork in a better package

oyvindberg · Jun 22, 2022 · aa73c65 · aa73c65
1 parent 0892076
commit aa73c65
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/bleep-core/src/main/scala/bleep/BuildLoader.scala b/bleep-core/src/main/scala/bleep/BuildLoader.scala
@@ -2,7 +2,7 @@ package bleep
 
 import bleep.internal.{FileUtils, Lazy}
 import io.circe.Json
-import io.circe.yaml24
+import io.circe.yaml12
 
 import java.nio.file.{Files, Path}
 import scala.util.control.NonFatal
@@ -32,7 +32,7 @@ object BuildLoader {
         case Left(be) => Left(be)
         case Right(jsonStr) =>
           try
-            yaml24.parser.parse(jsonStr).left.map(th => new BuildException.InvalidJson(bleepJson, th))
+            yaml12.parser.parse(jsonStr).left.map(th => new BuildException.InvalidJson(bleepJson, th))
           catch {
             case NonFatal(th) => Left(new BuildException.InvalidJson(bleepJson, th))
           }

diff --git a/bleep-core/src/main/scala/bleep/internal/package.scala b/bleep-core/src/main/scala/bleep/internal/package.scala
@@ -42,7 +42,7 @@ package object internal {
   def throwableMessages(th: Throwable): List[String] =
     th.getMessage :: Option(th.getCause).toList.flatMap(throwableMessages)
 
-  private val printer = new io.circe.yaml24.Printer(
+  private val printer = new io.circe.yaml12.Printer(
     preserveOrder = true,
     dropNullKeys = true
   )

diff --git a/.../main/scala/io/circe/yaml24/Printer.scala → .../main/scala/io/circe/yaml12/Printer.scala b/.../main/scala/io/circe/yaml24/Printer.scala → .../main/scala/io/circe/yaml12/Printer.scala
@@ -1,7 +1,7 @@
-package io.circe.yaml24
+package io.circe.yaml12
 
 import io.circe._
-import io.circe.yaml24.Printer._
+import io.circe.yaml12.Printer._
 import org.snakeyaml.engine.v2.api.{DumpSettings, StreamDataWriter}
 import org.snakeyaml.engine.v2.common
 import org.snakeyaml.engine.v2.emitter.Emitter

diff --git a/...cala/io/circe/yaml24/parser/package.scala → ...cala/io/circe/yaml12/parser/package.scala b/...cala/io/circe/yaml24/parser/package.scala → ...cala/io/circe/yaml12/parser/package.scala
@@ -1,4 +1,4 @@
-package io.circe.yaml24
+package io.circe.yaml12
 
 import cats.syntax.either._
 import io.circe._

diff --git a/...ala/io/circe/yaml24/printer/package.scala → ...ala/io/circe/yaml12/printer/package.scala b/...ala/io/circe/yaml24/printer/package.scala → ...ala/io/circe/yaml12/printer/package.scala
@@ -1,4 +1,4 @@
-package io.circe.yaml24
+package io.circe.yaml12
 
 import io.circe.Json
 

diff --git a/...cala/io/circe/yaml24/syntax/package.scala → ...cala/io/circe/yaml12/syntax/package.scala b/...cala/io/circe/yaml24/syntax/package.scala → ...cala/io/circe/yaml12/syntax/package.scala
@@ -1,4 +1,4 @@
-package io.circe.yaml24
+package io.circe.yaml12
 
 import io.circe.Json