Merge pull request #26 from rishavgp/master

Jackson version and scala build version upgrade
MediaMath · Nov 20, 2018 · ebc91d4 · ebc91d4
2 parents 94de00f + 420d4de
commit ebc91d4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
 
-version in ThisBuild := "1.0"
+version in ThisBuild := "1.1"
 
 lazy val json = crossProject(JSPlatform, JVMPlatform, NativePlatform)
     .crossType(CrossType.Full)

diff --git a/jvm/src/main/java/json/internal/BaseJValueObjectDeserializer.java b/jvm/src/main/java/json/internal/BaseJValueObjectDeserializer.java
@@ -47,7 +47,7 @@ public JValue deserialize(JsonParser jp, DeserializationContext ctx) throws IOEx
                 return jString(jp.getText());
             case VALUE_NUMBER_INT:
             case VALUE_NUMBER_FLOAT:
-                return JNumber$.MODULE$.apply(_parseDouble(jp, ctx));
+                return JNumber$.MODULE$.apply(_parseDoublePrimitive(jp, ctx));
             case VALUE_TRUE:
                 return JTrue$.MODULE$;
             case VALUE_FALSE:

diff --git a/project/ScalaJSON.scala b/project/ScalaJSON.scala
@@ -14,12 +14,9 @@
  * limitations under the License.
  */
 
+import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 import sbt.Keys._
-import sbt.Project.Initialize
 import sbt._
-import sbt.dsl._
-import org.scalajs.sbtplugin.ScalaJSPlugin
-import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 
 object Repository {
   val host = "artifactory.mediamath.com"
@@ -114,8 +111,8 @@ object ScalaJSON {
   )
 
   val jvmSettings = Seq(
-    libraryDependencies += "com.fasterxml.jackson.core" % "jackson-core" % "2.7.1",
-    libraryDependencies += "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.1",
+    libraryDependencies += "com.fasterxml.jackson.core" % "jackson-core" % "2.9.5",
+    libraryDependencies += "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.5",
     fork in Test := true
   )