diff options
| author | Jakob Odersky <jakob@odersky.com> | 2019-10-09 22:42:42 -0400 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2019-10-09 22:42:51 -0400 |
| commit | 962d8fbbb3c24afe584a7e5ca5a13e88bd823de9 (patch) | |
| tree | 1952236959f868fcfb06f11de0154899c8022c22 | |
| parent | 025725b960bb02383a3237cfa221320b7658b41b (diff) | |
| download | spray-json-962d8fbbb3c24afe584a7e5ca5a13e88bd823de9.tar.gz spray-json-962d8fbbb3c24afe584a7e5ca5a13e88bd823de9.tar.bz2 spray-json-962d8fbbb3c24afe584a7e5ca5a13e88bd823de9.zip | |
Build ScalaJS version for 2.13
| -rw-r--r-- | build.sbt | 6 | ||||
| -rw-r--r-- | js/src/main/boilerplate/spray/json/ProductFormatsInstances.scala.template | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -4,8 +4,8 @@ import com.typesafe.tools.mima.core.{ProblemFilters, ReversedMissingMethodProble lazy val scala210 = "2.10.7" lazy val scala211 = "2.11.12" -lazy val scala212 = "2.12.8" -lazy val scala213 = "2.13.0" +lazy val scala212 = "2.12.10" +lazy val scala213 = "2.13.1" lazy val sprayJson = crossProject(JVMPlatform, JSPlatform, NativePlatform) @@ -59,7 +59,7 @@ lazy val sprayJson = ) ) .jsSettings( - crossScalaVersions := Seq(scala212, scala211) + crossScalaVersions := Seq(scala213, scala212, scala211) ) .nativeSettings( crossScalaVersions := Seq(scala211), diff --git a/js/src/main/boilerplate/spray/json/ProductFormatsInstances.scala.template b/js/src/main/boilerplate/spray/json/ProductFormatsInstances.scala.template index d6f83f7..ea4fabf 100644 --- a/js/src/main/boilerplate/spray/json/ProductFormatsInstances.scala.template +++ b/js/src/main/boilerplate/spray/json/ProductFormatsInstances.scala.template @@ -25,7 +25,7 @@ trait ProductFormatsInstances { self: ProductFormats with StandardFormats => fields.sizeHint(1 * 2) [#fields ++= productElement##2Field[P1](fieldName1, p, 0)# ] - JsObject(fields: _*) + JsObject(fields.toSeq: _*) } def read(value: JsValue) = { [#val p1V = fromField[P1](value, fieldName1)# diff --git a/project/plugins.sbt b/project/plugins.sbt index 736a37d..aaeba38 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,7 +5,7 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.27") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.29") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.8") addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.0") |