diff --git a/bleep-core/src/main/scala/bleep/BuildLoader.scala b/bleep-core/src/main/scala/bleep/BuildLoader.scala index 1c66e8e43..63c199f6e 100644 --- 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 index 0355205a9..9dd87cf6e 100644 --- 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/bleep-core/src/main/scala/io/circe/yaml24/Printer.scala b/bleep-core/src/main/scala/io/circe/yaml12/Printer.scala similarity index 98% rename from bleep-core/src/main/scala/io/circe/yaml24/Printer.scala rename to bleep-core/src/main/scala/io/circe/yaml12/Printer.scala index 3c4559490..3779ea5e7 100644 --- a/bleep-core/src/main/scala/io/circe/yaml24/Printer.scala +++ b/bleep-core/src/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/bleep-core/src/main/scala/io/circe/yaml24/parser/package.scala b/bleep-core/src/main/scala/io/circe/yaml12/parser/package.scala similarity index 99% rename from bleep-core/src/main/scala/io/circe/yaml24/parser/package.scala rename to bleep-core/src/main/scala/io/circe/yaml12/parser/package.scala index fa43d81b8..ec4e9e756 100644 --- a/bleep-core/src/main/scala/io/circe/yaml24/parser/package.scala +++ b/bleep-core/src/main/scala/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/bleep-core/src/main/scala/io/circe/yaml24/printer/package.scala b/bleep-core/src/main/scala/io/circe/yaml12/printer/package.scala similarity index 88% rename from bleep-core/src/main/scala/io/circe/yaml24/printer/package.scala rename to bleep-core/src/main/scala/io/circe/yaml12/printer/package.scala index 34a519b14..734895bba 100644 --- a/bleep-core/src/main/scala/io/circe/yaml24/printer/package.scala +++ b/bleep-core/src/main/scala/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/bleep-core/src/main/scala/io/circe/yaml24/syntax/package.scala b/bleep-core/src/main/scala/io/circe/yaml12/syntax/package.scala similarity index 95% rename from bleep-core/src/main/scala/io/circe/yaml24/syntax/package.scala rename to bleep-core/src/main/scala/io/circe/yaml12/syntax/package.scala index 408eb00a8..2654cd7ce 100644 --- a/bleep-core/src/main/scala/io/circe/yaml24/syntax/package.scala +++ b/bleep-core/src/main/scala/io/circe/yaml12/syntax/package.scala @@ -1,4 +1,4 @@ -package io.circe.yaml24 +package io.circe.yaml12 import io.circe.Json