Update build.sbt

circe · Oct 17, 2022 · 1643f45 · 1643f45
1 parent a8672fb
commit 1643f45
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 42 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,6 +20,7 @@ jobs:
   build:
     name: Build and Test
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest]
         scala: [2.12.15, 2.13.8, 3.2.0]

diff --git a/README.md b/README.md
@@ -4,9 +4,9 @@
 [![Codecov status](https://codecov.io/gh/circe/circe-yaml/branch/master/graph/badge.svg)](https://codecov.io/gh/circe/circe-yaml)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.circe/circe-yaml_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.circe/circe-yaml_2.12)
 
-This is a small library which translates [SnakeYAML](https://bitbucket.org/snakeyaml/snakeyaml)'s AST into 
-[circe](https://github.com/circe/circe)'s AST.  It enables parsing [YAML](https://yaml.org) 1.1 documents into circe's
-`Json` AST.
+This is a small library for parsing [YAML](https://yaml.org) into [circe](https://github.com/circe/circe)'s `Json` AST.
+ * For parsing YAML 1.1 it uses [SnakeYAML](https://bitbucket.org/snakeyaml/snakeyaml).
+ * For parsing YAML 1.2 it uses [snakeyaml-engine](https://bitbucket.org/snakeyaml/snakeyaml-engine).
 
 ## Why?
 
@@ -22,14 +22,19 @@ the ADT marshalling.  You can also use circe's `Encoder` to obtain a `Json`, and
 
 The artifact is hosted by Sonatype, and release versions are synced to Maven Central:
 
+For YAML 1.1
 ```scala
-libraryDependencies += "io.circe" %% "circe-yaml" % "0.14.1"
+libraryDependencies += "io.circe" %% "circe-yaml" % "0.14.2"
+```
+or for YAML 1.2
+```scala
+libraryDependencies += "io.circe" %% "circe-yaml-v12" % "0.14.2"
 ```
 
 Snapshot versions are available by adding the Sonatype Snapshots resolver:
 
 ```scala
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 ```
 
 ### Parsing

diff --git a/build.sbt b/build.sbt
@@ -18,7 +18,8 @@ val Versions = new {
   val scalaCheck = "1.16.0"
   val scalaTest = "3.2.13"
   val scalaTestPlus = "3.2.11.0"
-  val snakeYaml = "1.32"
+  val snakeYaml = "1.33"
+  val snakeYamlEngine = "2.5"
   val previousCirceYaml = "0.13.1"
 }
 
@@ -28,44 +29,92 @@ ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8", "3.2.0")
 
 val root = project
   .in(file("."))
-  .enablePlugins(GhpagesPlugin)
+//  .settings(commonSettings)
   .settings(
-    name := "circe-yaml",
-    description := "Library for converting between SnakeYAML's AST and circe's AST",
-    scalacOptions ++= compilerOptions,
-    scalacOptions ++= {
-      CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((2, v)) if v <= 12 =>
-          Seq(
-            "-Xfuture",
-            "-Yno-adapted-args",
-            "-Ywarn-unused-import"
-          )
-        case _ =>
-          Seq(
-            "-Ywarn-unused:imports"
-          )
-      }
-    },
-    Compile / console / scalacOptions ~= {
-      _.filterNot(Set("-Ywarn-unused-import", "-Ywarn-unused:imports"))
-    },
-    Test / console / scalacOptions ~= {
-      _.filterNot(Set("-Ywarn-unused-import", "-Ywarn-unused:imports"))
-    },
-    libraryDependencies ++= Seq(
-      "io.circe" %% "circe-core" % Versions.circe,
-      "io.circe" %% "circe-jawn" % Versions.circe % Test,
-      "org.yaml" % "snakeyaml" % Versions.snakeYaml,
-      "io.circe" %% "circe-testing" % Versions.circe % Test,
-      "org.typelevel" %% "discipline-core" % Versions.discipline % Test,
-      "org.scalacheck" %% "scalacheck" % Versions.scalaCheck % Test,
-      "org.scalatest" %% "scalatest" % Versions.scalaTest % Test,
-      "org.scalatestplus" %% "scalacheck-1-15" % Versions.scalaTestPlus % Test
-    ),
-    mimaPreviousArtifacts := Set("io.circe" %% "circe-yaml" % Versions.previousCirceYaml)
+    name := "circe-yaml-root",
+    publish / skip := true
+  )
+  .aggregate(
+    `circe-yaml-common`,
+    `circe-yaml`,
+    `circe-yaml-v12`
   )
-  .settings(publishSettings ++ docSettings)
+//  .enablePlugins(GhpagesPlugin)
+
+lazy val `circe-yaml-common` =
+  project
+    .in(file("circe-yaml-common"))
+    .settings(commonSettings)
+    .settings(
+      description := "Library for converting between SnakeYAML's AST (YAML 1.1) and circe's AST",
+      libraryDependencies ++= Seq(
+        "io.circe" %% "circe-core" % Versions.circe
+      )
+    )
+    .enablePlugins(GhpagesPlugin)
+
+lazy val `circe-yaml` =
+  project
+    .in(file("circe-yaml"))
+    .settings(commonSettings)
+    .dependsOn(`circe-yaml-common`)
+    .settings(
+      description := "Library for converting between SnakeYAML's AST (YAML 1.1) and circe's AST",
+      libraryDependencies ++= Seq(
+        "org.yaml" % "snakeyaml" % Versions.snakeYaml,
+        "io.circe" %% "circe-jawn" % Versions.circe % Test,
+        "io.circe" %% "circe-testing" % Versions.circe % Test,
+        "org.typelevel" %% "discipline-core" % Versions.discipline % Test,
+        "org.scalacheck" %% "scalacheck" % Versions.scalaCheck % Test,
+        "org.scalatest" %% "scalatest" % Versions.scalaTest % Test,
+        "org.scalatestplus" %% "scalacheck-1-15" % Versions.scalaTestPlus % Test
+      ),
+      mimaPreviousArtifacts := Set("io.circe" %% "circe-yaml" % Versions.previousCirceYaml)
+    )
+    .enablePlugins(GhpagesPlugin)
+
+lazy val `circe-yaml-v12` =
+  project
+    .in(file("circe-yaml-v12"))
+    .settings(commonSettings)
+    .dependsOn(`circe-yaml-common`)
+    .settings(
+      description := "Library for converting between snakeyaml-engine's AST (YAML 1.2) and circe's AST",
+      libraryDependencies ++= Seq(
+        "io.circe" %% "circe-jawn" % Versions.circe % Test,
+        "org.snakeyaml" % "snakeyaml-engine" % Versions.snakeYamlEngine,
+        "io.circe" %% "circe-testing" % Versions.circe % Test,
+        "org.typelevel" %% "discipline-core" % Versions.discipline % Test,
+        "org.scalacheck" %% "scalacheck" % Versions.scalaCheck % Test,
+        "org.scalatest" %% "scalatest" % Versions.scalaTest % Test,
+        "org.scalatestplus" %% "scalacheck-1-15" % Versions.scalaTestPlus % Test
+      )
+    )
+    .enablePlugins(GhpagesPlugin)
+
+lazy val commonSettings = List(
+  scalacOptions ++= compilerOptions,
+  scalacOptions ++= {
+    CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, v)) if v <= 12 =>
+        Seq(
+          "-Xfuture",
+          "-Yno-adapted-args",
+          "-Ywarn-unused-import"
+        )
+      case _ =>
+        Seq(
+          "-Ywarn-unused:imports"
+        )
+    }
+  },
+  Compile / console / scalacOptions ~= {
+    _.filterNot(Set("-Ywarn-unused-import", "-Ywarn-unused:imports"))
+  },
+  Test / console / scalacOptions ~= {
+    _.filterNot(Set("-Ywarn-unused-import", "-Ywarn-unused:imports"))
+  }
+) ++ publishSettings ++ docSettings
 
 lazy val docSettings = Seq(
   autoAPIMappings := true,
@@ -116,6 +165,7 @@ lazy val publishSettings = Seq(
 ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.8")
 // No auto-publish atm. Remove this line to generate publish stage
 ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty
+ThisBuild / githubWorkflowBuildMatrixFailFast := Some(false)
 ThisBuild / githubWorkflowBuild := Seq(
   WorkflowStep.Sbt(
     List("clean", "coverage", "test", "coverageReport", "scalastyle", "scalafmtCheckAll"),