Merge branch 'main' into update/jackson-databind-2.15.3

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.3.1, 2.13.11, 2.12.18]
+        scala: [3.3.1, 2.13.12, 2.12.18]
         java: [temurin@8]
         project: [rootJS, rootJVM, rootNative]
     runs-on: ${{ matrix.os }}
@@ -180,32 +180,32 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.11, rootJS)
+      - name: Download target directories (2.13.12, rootJS)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootJS
 
-      - name: Inflate target directories (2.13.11, rootJS)
+      - name: Inflate target directories (2.13.12, rootJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.11, rootJVM)
+      - name: Download target directories (2.13.12, rootJVM)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootJVM
 
-      - name: Inflate target directories (2.13.11, rootJVM)
+      - name: Inflate target directories (2.13.12, rootJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.11, rootNative)
+      - name: Download target directories (2.13.12, rootNative)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootNative
 
-      - name: Inflate target directories (2.13.11, rootNative)
+      - name: Inflate target directories (2.13.12, rootNative)
         run: |
           tar xf targets.tar
           rm targets.tar

.jvmopts

@@ -0,0 +1 @@
+-Xmx4G

.scalafmt.conf

@@ -1,4 +1,4 @@
-version=3.7.12
+version=3.7.17
 runner.dialect = Scala213Source3
 align.openParenCallSite = true
 align.openParenDefnSite = true

benchmark/build.sbt

@@ -6,16 +6,16 @@ libraryDependencies ++= {
   if (scalaBinaryVersion.value.startsWith("2.12"))
     Seq(
       "io.argonaut" %% "argonaut" % "6.3.9",
-      "org.json4s" %% "json4s-native" % "4.0.6",
-      "org.json4s" %% "json4s-jackson" % "4.0.6",
-      "com.typesafe.play" %% "play-json" % "2.9.4",
+      "org.json4s" %% "json4s-native" % "4.0.7",
+      "org.json4s" %% "json4s-jackson" % "4.0.7",
+      "com.typesafe.play" %% "play-json" % "2.10.4",
       "com.rojoma" %% "rojoma-json" % "2.4.3",
       "com.rojoma" %% "rojoma-json-v3" % "3.15.0",
       "io.spray" %% "spray-json" % "1.3.6",
-      "org.parboiled" %% "parboiled" % "2.5.0",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.15.3",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.15.3",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.15.3",
+      "org.parboiled" %% "parboiled" % "2.5.1",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.16.1",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.16.1",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.16.1",
       "com.google.code.gson" % "gson" % "2.10.1"
     )
   else Nil

build.sbt

@@ -1,6 +1,6 @@
 ThisBuild / tlBaseVersion := "1.5"
 lazy val scala212 = "2.12.18"
-lazy val scala213 = "2.13.11"
+lazy val scala213 = "2.13.12"
 lazy val scala3 = "3.3.1"
 ThisBuild / crossScalaVersions := Seq(scala3, scala213, scala212)
 ThisBuild / tlVersionIntroduced := Map("3" -> "1.1.2")

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.9.8

project/plugins.sbt

@@ -1,5 +1,5 @@
 addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.22")
-addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16")