Update versions of dependencies and Scala for jsoniter-scala-benchmark sub-projects

Author: plokhotnyuk

build.sbt

@@ -20,7 +20,7 @@ lazy val commonSettings = Seq(
       url = url("https://twitter.com/aplokhotnyuk")
     )
   ),
-  scalaVersion := "3.3.3",
+  scalaVersion := "2.13.14",
   scalacOptions ++= Seq(
     "-deprecation",
     "-encoding", "UTF-8",
@@ -247,7 +247,7 @@ lazy val `jsoniter-scala-benchmark` = crossProject(JVMPlatform, JSPlatform)
   .settings(commonSettings)
   .settings(noPublishSettings)
   .settings(
-    crossScalaVersions := Seq("3.3.3", "2.13.14"),
+    crossScalaVersions := Seq("3.4.2", "2.13.14"),
     scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((2, _)) => Seq()
       case _ => Seq("-Yretain-trees", "-Xmax-inlines:100")
@@ -257,13 +257,13 @@ lazy val `jsoniter-scala-benchmark` = crossProject(JVMPlatform, JSPlatform)
       "org.playframework" %%% "play-json" % "3.0.4",
       "dev.zio" %%% "zio-json" % "0.7.1",
       "com.evolutiongaming" %%% "play-json-jsoniter" % "0.10.3",
-      "com.lihaoyi" %%% "upickle" % "3.3.1",
+      "com.lihaoyi" %%% "upickle" % "4.0.0",
       "io.circe" %%% "circe-generic" % "0.14.9",
       "io.circe" %%% "circe-parser" % "0.14.9",
       "io.circe" %%% "circe-jawn" % "0.14.9",
       "com.disneystreaming.smithy4s" %%% "smithy4s-json" % "0.18.23",
-      "org.json4s" %% "json4s-jackson" % "4.1.0-M5",
-      "org.json4s" %% "json4s-native" % "4.1.0-M5",
+      "org.json4s" %% "json4s-jackson" % "4.1.0-M6",
+      "org.json4s" %% "json4s-native" % "4.1.0-M6",
       "com.rallyhealth" %% "weepickle-v1" % "1.9.1",
       "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.17.2",
       "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.17.2",

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

@@ -2,7 +2,7 @@ package com.github.plokhotnyuk.jsoniter_scala.benchmark
 
 import com.github.plokhotnyuk.jsoniter_scala.benchmark.SuitEnum.SuitEnum
 import upickle.AttributeTagged
-import upickle.core.{Annotator, Visitor}
+import upickle.core.Visitor
 import java.time._
 import java.util.Base64
 import java.util.concurrent.ConcurrentHashMap
@@ -148,20 +148,6 @@ object UPickleReaderWriters extends AttributeTagged {
     macroRW
   }
 
-  override def annotate[V](rw: Reader[V], key: String, value: String): TaggedReader.Leaf[V] =
-    new TaggedReader.Leaf[V](tagName, simpleName(value), rw)
-
-  override def annotate[V](rw: ObjectWriter[V], key: String, value: String, checker: Annotator.Checker): TaggedWriter[V] =
-    new TaggedWriter.Leaf[V](checker, tagName, simpleName(value), rw)
-
-  override implicit def OptionWriter[T: Writer]: Writer[Option[T]] =
-    implicitly[Writer[T]].comap[Option[T]](_.getOrElse(null.asInstanceOf[T]))
-
-  override implicit def OptionReader[T: Reader]: Reader[Option[T]] =
-    new Reader.Delegate[Any, Option[T]](implicitly[Reader[T]].map(x => new Some(x))) {
-      override def visitNull(index: Int): Option[T] = None
-    }
-
   private[this] def strReader[T](f: CharSequence => T): SimpleReader[T] = new SimpleReader[T] {
     override val expectedMsg = "expected string"
 
@@ -181,6 +167,4 @@ object UPickleReaderWriters extends AttributeTagged {
   private[this] def numWriter[V]: Writer[V] = new Writer[V] {
     def write0[R](out: Visitor[_, R], v: V): R = out.visitFloat64String(v.toString, -1)
   }
-
-  private[this] def simpleName(s: String): String = s.substring(s.lastIndexOf('.') + 1)
 }