From ccf07d6e1dc216b38ac45ebb351e8c5e3e4c348b Mon Sep 17 00:00:00 2001
From: Doug Roper <doug.roper@rallyhealth.com>
Date: Fri, 15 Jul 2022 18:55:34 -0400
Subject: [PATCH] uPickle 2.0.0

---
 bench/src/main/scala/bench/BlackholeUVisitor.scala            | 2 +-
 bench/src/main/scala/bench/ScalaVersionBench.scala            | 4 ++--
 build.sbt                                                     | 2 +-
 project/WeePicklePlugin.scala                                 | 2 +-
 .../com/rallyhealth/weejson/v1/upicklecompat/UWVisitor.scala  | 2 +-
 .../com/rallyhealth/weejson/v1/upicklecompat/WUVisitor.scala  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bench/src/main/scala/bench/BlackholeUVisitor.scala b/bench/src/main/scala/bench/BlackholeUVisitor.scala
index 85e6a319..05d06def 100644
--- a/bench/src/main/scala/bench/BlackholeUVisitor.scala
+++ b/bench/src/main/scala/bench/BlackholeUVisitor.scala
@@ -16,7 +16,7 @@ class BlackholeUVisitor(bh: Blackhole) extends Visitor[Any, Null] {
     }
   }
 
-  override def visitObject(length: Int, index: Int): ObjVisitor[Any, Null] = new ObjVisitor[Any, Null] {
+  override def visitObject(length: Int, jsonableKeys: Boolean, index: Int): ObjVisitor[Any, Null] = new ObjVisitor[Any, Null] {
     override def visitKey(index: Int): Visitor[_, _] = {
       BlackholeUVisitor.this
     }
diff --git a/bench/src/main/scala/bench/ScalaVersionBench.scala b/bench/src/main/scala/bench/ScalaVersionBench.scala
index 6355bf7e..ae88279b 100644
--- a/bench/src/main/scala/bench/ScalaVersionBench.scala
+++ b/bench/src/main/scala/bench/ScalaVersionBench.scala
@@ -58,7 +58,7 @@ class FlatPrimitivesDefaultBench extends PickleFromToBench(ScalaVersionDefaultBe
 
 class FlatPrimitivesTruncDefaultBench extends PickleFromToBench(ScalaVersionDefaultBench.benchmarkFlatPrimitivesTrunc)
 
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@OutputTimeUnit(TimeUnit.SECONDS)
 class HandrolledFlatPrimitivesBench extends PickleFromToBench(HandrolledFlatPrimitives())
 
 @Warmup(iterations = 3, time = 5, timeUnit = TimeUnit.SECONDS)
@@ -335,7 +335,7 @@ object HandrolledFlatPrimitives {
   implicit val writer: default.Reader[HandrolledFlatPrimitives] = upickle.default.macroR[HandrolledFlatPrimitives]
   implicit val reader: default.Writer[HandrolledFlatPrimitives] = new upickle.default.Writer[HandrolledFlatPrimitives] {
     override def write0[V](out: core.Visitor[_, V], v: HandrolledFlatPrimitives): V = {
-      val obj = out.visitObject(6, -1).narrow
+      val obj = out.visitObject(6, true, -1).narrow
 
       obj.visitKeyValue(obj.visitKey(-1).visitString("i", -1))
       obj.visitValue(obj.subVisitor.visitInt32(Int.MinValue, -1), -1)
diff --git a/build.sbt b/build.sbt
index 91d97375..1fd2bab0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -201,7 +201,7 @@ lazy val `weejson-upickle` = project
   .dependsOn(weepickle)
   .settings(
     libraryDependencies ++= Seq(
-      "com.lihaoyi" %% "upickle" % "1.4.2",
+      "com.lihaoyi" %% "upickle" % "2.0.0",
     ),
     mimaPreviousArtifacts := {
       if (VersionNumber(version.value).matchesSemVer(SemanticSelector("<1.6.0")))
diff --git a/project/WeePicklePlugin.scala b/project/WeePicklePlugin.scala
index f3e233cc..a016302e 100644
--- a/project/WeePicklePlugin.scala
+++ b/project/WeePicklePlugin.scala
@@ -14,7 +14,7 @@ object WeePicklePlugin extends AutoPlugin {
 
     val scala211 = "2.11.12"
     val scala212 = "2.12.12"
-    val scala213 = "2.13.7"
+    val scala213 = "2.13.8"
     val scala3 = "3.1.0"
     val supportedScala2Versions = Seq(scala211, scala212, scala213)
     val supportedScalaVersions = supportedScala2Versions :+ scala3
diff --git a/weejson-upickle/src/main/scala/com/rallyhealth/weejson/v1/upicklecompat/UWVisitor.scala b/weejson-upickle/src/main/scala/com/rallyhealth/weejson/v1/upicklecompat/UWVisitor.scala
index 982a8a10..900e5e4a 100644
--- a/weejson-upickle/src/main/scala/com/rallyhealth/weejson/v1/upicklecompat/UWVisitor.scala
+++ b/weejson-upickle/src/main/scala/com/rallyhealth/weejson/v1/upicklecompat/UWVisitor.scala
@@ -18,7 +18,7 @@ class UWVisitor[T, J](visitor: upickle.core.Visitor[T, J]) extends Visitor[T, J]
   }
 
   override def visitObject(length: Int): ObjVisitor[T, J] = {
-    val obj = visitor.visitObject(length, -1)
+    val obj = visitor.visitObject(length, true, -1)
     new ObjVisitor[T, J] {
       override def visitKey(): Visitor[_, _] = new UWVisitor(obj.visitKey(-1))
 
diff --git a/weejson-upickle/src/main/scala/com/rallyhealth/weejson/v1/upicklecompat/WUVisitor.scala b/weejson-upickle/src/main/scala/com/rallyhealth/weejson/v1/upicklecompat/WUVisitor.scala
index 014d946d..29c07bf0 100644
--- a/weejson-upickle/src/main/scala/com/rallyhealth/weejson/v1/upicklecompat/WUVisitor.scala
+++ b/weejson-upickle/src/main/scala/com/rallyhealth/weejson/v1/upicklecompat/WUVisitor.scala
@@ -17,7 +17,7 @@ class WUVisitor[T, J](weepickle: Visitor[T, J]) extends upickle.core.Visitor[T,
     }
   }
 
-  override def visitObject(length: Int, index: Int): ObjVisitor[T, J] = {
+  override def visitObject(length: Int, jsonableKeys: Boolean, index: Int): ObjVisitor[T, J] = {
     val obj = weepickle.visitObject(length)
 
     new ObjVisitor[T, J] {