Pr118

boopickle/js/src/main/scala/boopickle/StringCodec.scala

@@ -38,7 +38,7 @@ object StringCodec extends StringCodecBase {
     val te = new TextEncoder
     // use native TextEncoder
     (str: String) =>
-      new Int8Array(te.encode(str))
+      new Int8Array(te.encode(str).buffer)
   }
 
   private lazy val utf16decoder: (Uint16Array) => String = {

build.sbt

@@ -8,8 +8,8 @@ ThisBuild / scalafmtOnCompile := true
 val commonSettings = Seq(
   organization := "io.suzaku",
   version := Version.library,
-  crossScalaVersions := Seq("2.11.12", "2.12.8", "2.13.0"),
-  scalaVersion in ThisBuild := "2.12.8",
+  crossScalaVersions := Seq("2.12.11", "2.13.2"),
+  scalaVersion in ThisBuild := "2.13.2",
   scalacOptions := Seq(
     "-deprecation",
     "-encoding",
@@ -36,22 +36,18 @@ val commonSettings = Seq(
   },
   testFrameworks += new TestFramework("utest.runner.Framework"),
   libraryDependencies ++= Seq(
-    if (scalaVersion.value.startsWith("2.11"))
-      "com.lihaoyi" %%% "utest" % "0.6.8" % Test
-    else
-      "com.lihaoyi" %%% "utest" % "0.6.9" % Test,
+     "com.lihaoyi" %%% "utest" % "0.7.4" % Test,
     "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided"
   )
 )
 
-val nativeSettings = Seq(
-  scalaVersion := "2.11.12",
-  crossScalaVersions := Seq("2.11.12"),
+/*val nativeSettings = Seq(
   nativeLinkStubs := true,
+  scalaVersion in ThisBuild := "2.11.12",
   // Disable Scaladoc generation because of:
   // [error] dropping dependency on node with no phase object: mixin
   Compile / doc / sources := Seq.empty
-)
+)*/
 
 val releaseSettings = Seq(
   scmInfo := Some(
@@ -116,11 +112,11 @@ lazy val boopickle = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   )
   .jsSettings(sourceMapSettings)
   .jvmSettings()
-  .nativeSettings(nativeSettings)
+  //.nativeSettings(nativeSettings)
 
 lazy val boopickleJS = boopickle.js
 lazy val boopickleJVM = boopickle.jvm
-lazy val boopickleNative = boopickle.native
+//lazy val boopickleNative = boopickle.native
 
 lazy val shapeless = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .crossType(CrossType.Pure)
@@ -135,11 +131,11 @@ lazy val shapeless = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   )
   .jsSettings(sourceMapSettings)
   .jvmSettings()
-  .nativeSettings(nativeSettings)
+  //.nativeSettings(nativeSettings)
 
 lazy val shapelessJS = shapeless.js
 lazy val shapelessJVM = shapeless.jvm
-lazy val shapelessNative = shapeless.native
+//lazy val shapelessNative = shapeless.native
 
 lazy val generateTuples = taskKey[Unit]("Generates source code for pickling tuples")
 
@@ -180,31 +176,31 @@ lazy val perftests = crossProject(JSPlatform, JVMPlatform)
     scalaVersion := "2.12.6",
     scalacOptions ++= Seq("-Xstrict-inference"),
     libraryDependencies ++= Seq(
-      "com.lihaoyi"       %%% "upickle"       % "0.5.1",
-      "com.typesafe.play" %%% "play-json"     % "2.6.9",
-      "io.circe"          %%% "circe-core"    % "0.9.2",
-      "io.circe"          %%% "circe-parser"  % "0.9.2",
-      "io.circe"          %%% "circe-generic" % "0.9.2"
+      "com.lihaoyi"       %%% "upickle"       % "1.0.0",
+      "com.typesafe.play" %%% "play-json"     % "2.8.1", // Not available for sjs1
+      "io.circe"          %%% "circe-core"    % "0.13.0",
+      "io.circe"          %%% "circe-parser"  % "0.13.0",
+      "io.circe"          %%% "circe-generic" % "0.13.0"
     ),
     addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full)
   )
   .enablePlugins(JmhPlugin)
   .jsSettings(
-    scalaJSOptimizerOptions in (Compile, fullOptJS) ~= { _.withUseClosureCompiler(false) },
+//    scalaJSOptimizerOptions in (Compile, fullOptJS) ~= { _.withUseClosureCompiler(false) },
     libraryDependencies ++= Seq(
-      "org.scala-js" %%% "scalajs-dom" % "0.9.6",
-      "com.lihaoyi"  %%% "scalatags"   % "0.6.7"
+      "org.scala-js" %%% "scalajs-dom" % "1.0.0",
+      "com.lihaoyi"  %%% "scalatags"   % "0.8.6"
     )
   )
 
-lazy val perftestsJS = preventPublication(perftests.js).enablePlugins(WorkbenchPlugin).dependsOn(boopickleJS)
+lazy val perftestsJS = preventPublication(perftests.js)./*enablePlugins(WorkbenchPlugin).*/dependsOn(boopickleJS)
 
 lazy val perftestsJVM = preventPublication(perftests.jvm)
   .settings(
-    libraryDependencies += "io.circe" %% "circe-jawn" % "0.9.2"
+    libraryDependencies += "io.circe" %% "circe-jawn" % "0.13.0"
   )
   .dependsOn(boopickleJVM)
 
 lazy val booPickleRoot = preventPublication(project.in(file(".")))
   .settings(commonSettings)
-  .aggregate(boopickleJS, boopickleJVM, boopickleNative, shapelessJS, shapelessJVM, shapelessNative)
+  .aggregate(boopickleJS, boopickleJVM, /*boopickleNative,*/ shapelessJS, shapelessJVM /*, shapelessNative*/)

project/Version.scala

@@ -1,3 +1,3 @@
 object Version {
-  val library = "1.3.1"
+  val library = "1.3.2"
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.9

project/plugins.sbt

@@ -1,15 +1,15 @@
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.28")
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.1")
 
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
 
-addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.0")
+addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.8")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.7")
 
-addSbtPlugin("com.lihaoyi" % "workbench" % "0.4.1")
+//addSbtPlugin("com.lihaoyi" % "workbench" % "0.4.1")
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")