Update Scala Native to 0.5.4, circe-* to 0.14.9, and scala-java-time-tzdb to 2.6.0 (#1152)

Author: plokhotnyuk

README.md

@@ -162,7 +162,7 @@ view of an error context
 - Support of JVMs for Java 11+ versions
 - Support of compilation to a native image by GraalVM
 - Support of Scala.js 1.0+ for all supported Scala versions
-- Support of Scala Native 0.4+ for all supported Scala versions
+- Support of Scala Native 0.5+ for all supported Scala versions
 - Suppressing of all WartRemover warnings of generated codecs for Scala 2.12 and 2.13 
 
 There are configurable options that can be set in compile-time:
@@ -215,6 +215,10 @@ supports JDK 8+ and native image compilation with earlier versions of GraalVM.
 The [**v2.13.3.2**](https://github.com/plokhotnyuk/jsoniter-scala/releases/tag/v2.13.3.2) release is the last version that
 supports Scala 2.11.
 
+The [**v2.30.2**](https://github.com/plokhotnyuk/jsoniter-scala/releases/tag/v2.30.2) release is the last version that
+supports Scala Native 0.4+.
+
+
 For upcoming features and fixes see [Commits](https://github.com/plokhotnyuk/jsoniter-scala/commits/master)
 and [Issues page](https://github.com/plokhotnyuk/jsoniter-scala/issues).
 

build.sbt

@@ -1,6 +1,7 @@
 import com.typesafe.tools.mima.core.{DirectMissingMethodProblem, ProblemFilters}
 import org.scalajs.linker.interface.{CheckedBehavior, ESVersion}
 import sbt.*
+import scala.scalanative.build.*
 import scala.sys.process.*
 
 lazy val oldVersion = "git describe --abbrev=0".!!.trim.replaceAll("^v", "")
@@ -66,7 +67,7 @@ lazy val jsSettings = Seq(
     }
   },
   libraryDependencies ++= Seq(
-    "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0" % Test
+    "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.6.0" % Test
   ),
   scalaJSLinkerConfig ~= {
     _.withSemantics({
@@ -88,10 +89,14 @@ lazy val jsSettings = Seq(
 lazy val nativeSettings = Seq(
   scalacOptions ++= Seq("-P:scalanative:genStaticForwardersForNonTopLevelObjects"),
   libraryDependencies ++= Seq(
-    "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0" % Test
+    "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.6.0" % Test
   ),
-  //nativeMode := "release-full", // Uncomment and test with these options
-  //nativeLTO := "thin",
+  nativeConfig ~= {
+    _.withMode(Mode.releaseFast) // TODO: test with `Mode.releaseSize` and `Mode.releaseFull`
+      .withLTO(LTO.none)
+      .withGC(GC.immix)
+  },
+  mimaPreviousArtifacts := Set(), // FIXME: remove after release with Scala Native 0.5 support
   coverageEnabled := false // FIXME: Unexpected linking error
 )
 
@@ -152,14 +157,14 @@ lazy val `jsoniter-scala-core` = crossProject(JVMPlatform, JSPlatform, NativePla
   .settings(
     crossScalaVersions := Seq("3.3.3", "2.13.14", "2.12.19"),
     libraryDependencies ++= Seq(
-      "org.scala-lang.modules" %%% "scala-collection-compat" % "2.11.0" % Test,
-      "org.scalatestplus" %%% "scalacheck-1-17" % "3.2.18.0" % Test,
+      "org.scala-lang.modules" %%% "scala-collection-compat" % "2.12.0" % Test,
+      "org.scalatestplus" %%% "scalacheck-1-18" % "3.2.18.0" % Test,
       "org.scalatest" %%% "scalatest" % "3.2.18" % Test
     )
   )
   .platformsSettings(JSPlatform, NativePlatform)(
     libraryDependencies ++= Seq(
-      "io.github.cquiroz" %%% "scala-java-time" % "2.5.0"
+      "io.github.cquiroz" %%% "scala-java-time" % "2.6.0"
     )
   )
 
@@ -186,7 +191,7 @@ lazy val `jsoniter-scala-macros` = crossProject(JVMPlatform, JSPlatform, NativeP
     }) ++ Seq(
       "com.epam.deltix" % "dfp" % "1.0.3" % Test,
       "org.scalatest" %%% "scalatest" % "3.2.18" % Test,
-      "org.scala-lang.modules" %%% "scala-collection-compat" % "2.11.0" % Test
+      "org.scala-lang.modules" %%% "scala-collection-compat" % "2.12.0" % Test
     )
   )
 
@@ -222,8 +227,8 @@ lazy val `jsoniter-scala-circe` = crossProject(JVMPlatform, JSPlatform, NativePl
   .settings(
     crossScalaVersions := Seq("3.3.3", "2.13.14", "2.12.19"),
     libraryDependencies ++= Seq(
-      "io.circe" %%% "circe-core" % "0.14.7",
-      "io.circe" %%% "circe-parser" % "0.14.7" % Test,
+      "io.circe" %%% "circe-core" % "0.14.9",
+      "io.circe" %%% "circe-parser" % "0.14.9" % Test,
       "org.scalatest" %%% "scalatest" % "3.2.18" % Test
     )
   )
@@ -254,9 +259,9 @@ lazy val `jsoniter-scala-benchmark` = crossProject(JVMPlatform, JSPlatform)
       "dev.zio" %%% "zio-json" % "0.7.1",
       "com.evolutiongaming" %%% "play-json-jsoniter" % "0.10.3",
       "com.lihaoyi" %%% "upickle" % "3.3.1",
-      "io.circe" %%% "circe-generic" % "0.14.8",
-      "io.circe" %%% "circe-parser" % "0.14.8",
-      "io.circe" %%% "circe-jawn" % "0.14.8",
+      "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",

jsoniter-scala-core/native/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/ByteArrayAccess.scala

@@ -1,31 +1,42 @@
 package com.github.plokhotnyuk.jsoniter_scala.core
 
+import scala.scalanative.annotation.alwaysinline
 import scala.scalanative.runtime.Intrinsics._
 import scala.scalanative.runtime.LLVMIntrinsics._
 import scala.scalanative.runtime.RawPtr
+import scala.scalanative.meta.LinktimeInfo.isMultithreadingEnabled
 
 private[core] object ByteArrayAccess {
-  @inline
-  private[this] def toPtr(buf: Array[Byte], pos: Int): RawPtr = elemRawPtr(castObjectToRawPtr(buf), pos + 16)
+  // Borrowed from https://github.com/scala-native/scala-native/blob/2bb9cc6f032a5b00083d0a6bbc96aba2632f61d4/nativelib/src/main/scala/scala/scalanative/runtime/MemoryLayout.scala
+  @alwaysinline
+  private[this] def PtrSize: Int = castRawSizeToInt(sizeOf[RawPtr])
 
-  @inline
+  @alwaysinline
+  private[this] def ValuesOffset: Int =
+    (if (isMultithreadingEnabled) PtrSize
+    else 0) + PtrSize + 8
+
+  @alwaysinline
+  private[this] def toPtr(buf: Array[Byte], pos: Int): RawPtr = elemRawPtr(castObjectToRawPtr(buf), pos + ValuesOffset)
+
+  @alwaysinline
   def setLong(buf: Array[Byte], pos: Int, value: Long): Unit = storeLong(toPtr(buf, pos), value)
 
-  @inline
+  @alwaysinline
   def getLong(buf: Array[Byte], pos: Int): Long = loadLong(toPtr(buf, pos))
 
-  @inline
+  @alwaysinline
   def setInt(buf: Array[Byte], pos: Int, value: Int): Unit = storeInt(toPtr(buf, pos), value)
 
-  @inline
+  @alwaysinline
   def getInt(buf: Array[Byte], pos: Int): Int = loadInt(toPtr(buf, pos))
 
-  @inline
+  @alwaysinline
   def setShort(buf: Array[Byte], pos: Int, value: Short): Unit = storeShort(toPtr(buf, pos), value)
 
-  @inline
+  @alwaysinline
   def setLongReversed(buf: Array[Byte], pos: Int, value: Long): Unit = storeLong(toPtr(buf, pos), `llvm.bswap.i64`(value))
 
-  @inline
+  @alwaysinline
   def getIntReversed(buf: Array[Byte], pos: Int): Int = `llvm.bswap.i32`(getInt(buf, pos))
 }

jsoniter-scala-core/native/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/NativeMath.scala

@@ -6,8 +6,8 @@ import scala.scalanative.unsafe._
 @extern
 private[core] object NativeMath {
   @name("jsoniter_scala_multiply_high")
-  def multiplyHigh(x: CLong, y: CLong): CLong = extern
+  def multiplyHigh(x: Long, y: Long): Long = extern
 
   @name("jsoniter_scala_unsigned_multiply_high")
-  def unsignedMultiplyHigh(x: CLong, y: CLong): CLong = extern
+  def unsignedMultiplyHigh(x: Long, y: Long): Long = extern
 }

jsoniter-scala-core/shared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReaderSpec.scala

@@ -727,8 +727,9 @@ class JsonReaderSpec extends AnyWordSpec with Matchers with ScalaCheckPropertyCh
       }
       val sb = new StringBuilder
       sb.append('"')
+      val l = (ReaderConfig.maxCharBufSize + 1) * 4
       var i = 0
-      while (i < (ReaderConfig.maxCharBufSize + 1) * 4) {
+      while (i < l) {
         sb.append('1')
         i += 1
       }
@@ -783,8 +784,9 @@ class JsonReaderSpec extends AnyWordSpec with Matchers with ScalaCheckPropertyCh
       checkError(""""000=!""", """expected '"', offset: 0x00000005""")
       val sb = new StringBuilder
       sb.append('"')
+      val l = (ReaderConfig.maxCharBufSize + 1) * 3
       var i = 0
-      while (i < (ReaderConfig.maxCharBufSize + 1) * 3) {
+      while (i < l) {
         sb.append('1')
         i += 1
       }
@@ -1822,7 +1824,7 @@ class JsonReaderSpec extends AnyWordSpec with Matchers with ScalaCheckPropertyCh
         check("2018-10-28T02:30+02:00[Europe/Warsaw]", ws)
         check("2018-10-28T02:30+03:00[Europe/Warsaw]", ws)
       }
-      forAll(genZonedDateTime, genWhitespaces, minSuccessful(10000))((x, ws) => {
+      forAll(genZonedDateTime, genWhitespaces, minSuccessful(100))((x, ws) => {
         val s = x.toString
         reader(s"""$ws"$s"""").readZonedDateTime(null) shouldBe x
         reader(s"""$ws"$s":$ws""").readKeyAsZonedDateTime() shouldBe x
@@ -1938,7 +1940,7 @@ class JsonReaderSpec extends AnyWordSpec with Matchers with ScalaCheckPropertyCh
       reader("null").readZoneId(default) shouldBe default
     }
     "parse ZoneId from a string representation according to ISO-8601 format for timezone offset or JDK format for IANA timezone identifier" in {
-      forAll(genZoneId, genWhitespaces, minSuccessful(10000)) { (x, ws) =>
+      forAll(genZoneId, genWhitespaces, minSuccessful(1000)) { (x, ws) =>
         val s = x.toString
         reader(s"""$ws"$s"""").readZoneId(null) shouldBe x
         reader(s"""$ws"$s":""").readKeyAsZoneId() shouldBe x
@@ -2247,8 +2249,9 @@ class JsonReaderSpec extends AnyWordSpec with Matchers with ScalaCheckPropertyCh
     "throw parsing exception for too long strings" in {
       val sb = new StringBuilder
       sb.append('"')
+      val l = ReaderConfig.maxCharBufSize
       var i = 0
-      while (i < ReaderConfig.maxCharBufSize) {
+      while (i < l) {
         sb.append(' ')
         i += 1
       }
@@ -2707,8 +2710,8 @@ class JsonReaderSpec extends AnyWordSpec with Matchers with ScalaCheckPropertyCh
     }
     "parse denormalized numbers with long mantissa and compensating exponent" in {
       forAll(genWhitespaces) { ws =>
-        check("1" + "0" * 1000000 + "e-1000000", 1.0f, ws)
-        check("0." + "0" * 1000000 + "1e1000000", 0.1f, ws)
+        check("1" + "0" * 100000 + "e-100000", 1.0f, ws)
+        check("0." + "0" * 100000 + "1e100000", 0.1f, ws)
       }
     }
     "throw parsing exception on illegal or empty input" in {
@@ -3109,7 +3112,7 @@ class JsonReaderSpec extends AnyWordSpec with Matchers with ScalaCheckPropertyCh
         jsonReader.nextToken().toChar shouldBe s2.charAt(0)
       }
 
-      forAll(Gen.size, minSuccessful(10000)) { n =>
+      forAll(Gen.size, minSuccessful(1000)) { n =>
         check(n, "123456")(_.readBigInt(null))
         check(n, """"UTC"""")(_.readZoneId(null))
         check(n, "[true]")(_.readRawValAsBytes())

project/plugins.sbt

@@ -4,7 +4,7 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
 addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1")
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.4")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.0")
 addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")