diff options
| author | Lucheng Zhang | 2022-04-22 01:24:42 +0800 |
|---|---|---|
| committer | GitHub | 2022-04-21 17:24:42 +0000 |
| commit | f31416a8b7122ab29b3243c5d35670030e244455 (patch) | |
| tree | 10277e0391c5a4edaf0ef600ce34c51d4d5bc9bc | |
| parent | 9c1d139470605059124178f40502cbb84383ff6f (diff) | |
Update json4s-native to 4.0.5 (#2519)
| -rw-r--r-- | build.sbt | 2 | ||||
| -rw-r--r-- | build.sc | 2 | ||||
| -rw-r--r-- | src/main/scala/firrtl/annotations/JsonProtocol.scala | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -33,7 +33,7 @@ lazy val firrtlSettings = Seq( "org.scalatestplus" %% "scalacheck-1-15" % "3.2.11.0" % "test", "com.github.scopt" %% "scopt" % "3.7.1", "net.jcazevedo" %% "moultingyaml" % "0.4.2", - "org.json4s" %% "json4s-native" % "3.6.12", + "org.json4s" %% "json4s-native" % "4.0.5", "org.apache.commons" % "commons-text" % "1.9", "io.github.alexarchambault" %% "data-class" % "0.2.5", "com.lihaoyi" %% "os-lib" % "0.8.1" @@ -47,7 +47,7 @@ class firrtlCrossModule(val crossScalaVersion: String) ivy"${scalaOrganization()}:scala-reflect:${scalaVersion()}", ivy"com.github.scopt::scopt:3.7.1", ivy"net.jcazevedo::moultingyaml:0.4.2", - ivy"org.json4s::json4s-native:3.6.12", + ivy"org.json4s::json4s-native:4.0.5", ivy"org.apache.commons:commons-text:1.9", ivy"io.github.alexarchambault::data-class:0.2.5", ivy"org.antlr:antlr4-runtime:$antlr4Version", diff --git a/src/main/scala/firrtl/annotations/JsonProtocol.scala b/src/main/scala/firrtl/annotations/JsonProtocol.scala index 24ebc781..fe35c77d 100644 --- a/src/main/scala/firrtl/annotations/JsonProtocol.scala +++ b/src/main/scala/firrtl/annotations/JsonProtocol.scala @@ -223,7 +223,7 @@ object JsonProtocol extends LazyLogging { /** Construct Json formatter for annotations */ def jsonFormat(tags: Seq[Class[_]]) = { - Serialization.formats(FullTypeHints(tags.toList)).withTypeHintFieldName("class") + + Serialization.formats(FullTypeHints(tags.toList, "class")) + new TransformClassSerializer + new NamedSerializer + new CircuitNameSerializer + new ModuleNameSerializer + new ComponentNameSerializer + new TargetSerializer + new GenericTargetSerializer + new CircuitTargetSerializer + new ModuleTargetSerializer + |
