From d4c1cd7b27ca1f081b56f237f5ac6b3fa3aae146 Mon Sep 17 00:00:00 2001 From: Zak Date: Tue, 2 Jul 2019 16:41:10 -0500 Subject: [PATCH 1/3] Update circe version for publishing on 2.13 Add enumeratum circe to project refs --- build.sbt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index a87736fa..30f3ab56 100644 --- a/build.sbt +++ b/build.sbt @@ -67,6 +67,7 @@ def thePlayJsonVersion(scalaVersion: String) = def theCirceVersion(scalaVersion: String) = CrossVersion.partialVersion(scalaVersion) match { + case Some((2, scalaMajor)) if scalaMajor >= 13 => "0.12.0-M4" case Some((2, scalaMajor)) if scalaMajor >= 11 => "0.11.1" case Some((2, scalaMajor)) if scalaMajor == 10 => "0.9.3" case _ => @@ -103,7 +104,9 @@ lazy val scala213ProjectRefs = Seq( enumeratumPlayJsonJs, enumeratumArgonautJs, enumeratumArgonautJvm, - enumeratumPlay + enumeratumPlay, + enumeratumCirceJvm, + enumeratumCirceJs ).map(Project.projectToRef) lazy val scala_2_13 = Project(id = "scala_2_13", base = file("scala_2_13")) From f07f61c24f8023272c4ca40ff9a8a5ceecdf4786 Mon Sep 17 00:00:00 2001 From: Zak Date: Wed, 3 Jul 2019 20:22:16 -0500 Subject: [PATCH 2/3] Remove scalajs for enumeratum-circe --- build.sbt | 1 - 1 file changed, 1 deletion(-) diff --git a/build.sbt b/build.sbt index 30f3ab56..cdf4cbbc 100644 --- a/build.sbt +++ b/build.sbt @@ -106,7 +106,6 @@ lazy val scala213ProjectRefs = Seq( enumeratumArgonautJvm, enumeratumPlay, enumeratumCirceJvm, - enumeratumCirceJs ).map(Project.projectToRef) lazy val scala_2_13 = Project(id = "scala_2_13", base = file("scala_2_13")) From 5d0884eee115be934e4e343c1c54e83e020eb0b9 Mon Sep 17 00:00:00 2001 From: Zak Date: Fri, 5 Jul 2019 10:21:33 -0500 Subject: [PATCH 3/3] Add not-java-time for circe on js/2.13, include in build for js --- build.sbt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build.sbt b/build.sbt index cdf4cbbc..a179170a 100644 --- a/build.sbt +++ b/build.sbt @@ -106,6 +106,7 @@ lazy val scala213ProjectRefs = Seq( enumeratumArgonautJvm, enumeratumPlay, enumeratumCirceJvm, + enumeratumCirceJs, ).map(Project.projectToRef) lazy val scala_2_13 = Project(id = "scala_2_13", base = file("scala_2_13")) @@ -330,6 +331,14 @@ lazy val enumeratumCirce = crossProject(JSPlatform, JVMPlatform) ) } ) + .jsSettings( + libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match { + case Some((2, scalaMajor)) if scalaMajor >= 13 => Seq( + "io.circe" %%% "not-java-time" % "0.2.0" % Test + ) + case _ => Seq() + } + )) lazy val enumeratumCirceJs = enumeratumCirce.js lazy val enumeratumCirceJvm = enumeratumCirce.jvm