Skip to content

Commit 11b96a5

Browse files
committed
Update zio-json 0.7.35
1 parent 5554245 commit 11b96a5

File tree

10 files changed

+12
-18
lines changed

10 files changed

+12
-18
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ lazy val `jsoniter-scala-benchmark` = crossProject(JVMPlatform, JSPlatform)
243243
"com.disneystreaming.smithy4s" %%% "smithy4s-json" % "0.18.29",
244244
"com.evolutiongaming" %%% "play-json-jsoniter" % "0.10.3" intransitive(),
245245
"org.playframework" %%% "play-json" % "3.0.4",
246-
"dev.zio" %%% "zio-json" % "0.7.33",
246+
"dev.zio" %%% "zio-json" % "0.7.35",
247247
"dev.zio" %%% "zio-schema-json" % "1.6.3",
248248
"io.circe" %%% "circe-generic" % "0.14.10",
249249
"io.circe" %%% "circe-jawn" % "0.14.10",

jsoniter-scala-benchmark/js/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/Main.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,8 +1654,7 @@ object Main {
16541654
B("playJsonJsoniter")(benchmark.playJsonJsoniter()),
16551655
B("smithy4sJson")(benchmark.smithy4sJson()),
16561656
B("uPickle")(benchmark.uPickle()),
1657-
//FIXME: zio-json skips serialization of the `"description": {}` field
1658-
//B("zioJson")(benchmark.zioJson()),
1657+
B("zioJson")(benchmark.zioJson()),
16591658
B("zioSchemaJson")(benchmark.zioSchemaJson())
16601659
))
16611660
}, {

jsoniter-scala-benchmark/js/src/main/scala-3/com/github/plokhotnyuk/jsoniter_scala/benchmark/Main.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,8 +1538,7 @@ object Main {
15381538
B("playJsonJsoniter")(benchmark.playJsonJsoniter()),
15391539
B("smithy4sJson")(benchmark.smithy4sJson()),
15401540
B("uPickle")(benchmark.uPickle()),
1541-
//FIXME: zio-json skips serialization of the `"description": {}` field
1542-
//B("zioJson")(benchmark.zioJson()),
1541+
B("zioJson")(benchmark.zioJson()),
15431542
B("zioSchemaJson")(benchmark.zioSchemaJson())
15441543
))
15451544
}, {

jsoniter-scala-benchmark/js/src/test/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/TwitterAPIWritingSpec.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ class TwitterAPIWritingSpec extends BenchmarkSpecBase {
1818
toString(b.playJsonJsoniter()) shouldBe b.compactJsonString1
1919
toString(b.smithy4sJson()) shouldBe b.compactJsonString1
2020
toString(b.uPickle()) shouldBe b.compactJsonString1
21-
//FIXME: zio-json skips serialization of the `"description": {}` field
22-
//toString(b.zioJson()) shouldBe b.compactJsonString1
21+
toString(b.zioJson()) shouldBe b.compactJsonString1
2322
toString(b.zioSchemaJson()) shouldBe b.compactJsonString1
2423
}
2524
}

jsoniter-scala-benchmark/js/src/test/scala-3/com/github/plokhotnyuk/jsoniter_scala/benchmark/TwitterAPIWritingSpec.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ class TwitterAPIWritingSpec extends BenchmarkSpecBase {
1717
toString(b.playJsonJsoniter()) shouldBe b.compactJsonString1
1818
toString(b.smithy4sJson()) shouldBe b.compactJsonString1
1919
toString(b.uPickle()) shouldBe b.compactJsonString1
20-
//FIXME: zio-json skips serialization of the `"description": {}` field
21-
//toString(b.zioJson()) shouldBe b.compactJsonString1
20+
toString(b.zioJson()) shouldBe b.compactJsonString1
2221
toString(b.zioSchemaJson()) shouldBe b.compactJsonString1
2322
}
2423
}

jsoniter-scala-benchmark/jvm/src/test/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/TwitterAPIWritingSpec.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ class TwitterAPIWritingSpec extends BenchmarkSpecBase {
2727
toString(b.sprayJson()) shouldBe b.compactJsonString2
2828
toString(b.uPickle()) shouldBe b.compactJsonString1
2929
toString(b.weePickle()) shouldBe b.compactJsonString1
30-
//FIXME: zio-json skips serialization of the `"description": {}` field
31-
//toString(b.zioJson()) shouldBe b.compactJsonString1
30+
toString(b.zioJson()) shouldBe b.compactJsonString1
3231
toString(b.zioSchemaJson()) shouldBe b.compactJsonString1
3332
}
3433
}

jsoniter-scala-benchmark/jvm/src/test/scala-3/com/github/plokhotnyuk/jsoniter_scala/benchmark/TwitterAPIWritingSpec.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ class TwitterAPIWritingSpec extends BenchmarkSpecBase {
2424
toString(b.sprayJson()) shouldBe b.compactJsonString2
2525
toString(b.uPickle()) shouldBe b.compactJsonString1
2626
toString(b.weePickle()) shouldBe b.compactJsonString1
27-
//FIXME: zio-json skips serialization of the `"description": {}` field
28-
//toString(b.zioJson()) shouldBe b.compactJsonString1
27+
toString(b.zioJson()) shouldBe b.compactJsonString1
2928
toString(b.zioSchemaJson()) shouldBe b.compactJsonString1
3029
}
3130
}

jsoniter-scala-benchmark/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/TwitterAPIWriting.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class TwitterAPIWriting extends TwitterAPIBenchmark {
138138

139139
FromScala(obj).transform(ToJson.bytes)
140140
}
141-
/* FIXME: zio-json skips serialization of the `"description": {}` field
141+
142142
@Benchmark
143143
def zioJson(): Array[Byte] = {
144144
import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioJsonCodecs._
@@ -147,7 +147,7 @@ class TwitterAPIWriting extends TwitterAPIBenchmark {
147147

148148
obj.toJson.getBytes(UTF_8)
149149
}
150-
*/
150+
151151
@Benchmark
152152
def zioSchemaJson(): Array[Byte] = {
153153
import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioSchemaJsonCodecs._

jsoniter-scala-benchmark/shared/src/main/scala-3/com/github/plokhotnyuk/jsoniter_scala/benchmark/TwitterAPIWriting.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class TwitterAPIWriting extends TwitterAPIBenchmark {
122122

123123
FromScala(obj).transform(ToJson.bytes)
124124
}
125-
/* FIXME: zio-json skips serialization of the `"description": {}` field
125+
126126
@Benchmark
127127
def zioJson(): Array[Byte] = {
128128
import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioJsonCodecs._
@@ -131,7 +131,7 @@ class TwitterAPIWriting extends TwitterAPIBenchmark {
131131

132132
obj.toJson.getBytes(UTF_8)
133133
}
134-
*/
134+
135135
@Benchmark
136136
def zioSchemaJson(): Array[Byte] = {
137137
import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioSchemaJsonCodecs._

jsoniter-scala-benchmark/shared/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/ZioJsonCodecs.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ object ZioJsonCodecs {
170170
val matrix = new StringMatrix(values.map(_.toString))
171171
(trace: List[JsonError], in: RetractReader) => {
172172
val idx = Lexer.enumeration(trace, in, matrix)
173-
if (idx == -1) Lexer.error("SuitEnum", trace)
173+
if (idx < 0) Lexer.error("SuitEnum", trace)
174174
values(idx)
175175
}
176176
})

0 commit comments

Comments
 (0)