From e8d5bcc6007ce9d31864cacbe75c83119b0498b9 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Wed, 28 Jun 2017 02:27:41 -0400
Subject: [PATCH] bump sjson-new to latest

---
 build.sbt                  | 9 +++++++--
 project/Dependencies.scala | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build.sbt b/build.sbt
index d949c1797..69bd536f6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -3,7 +3,7 @@ import Path._
 
 // import com.typesafe.tools.mima.core._, ProblemFilters._
 
-def baseVersion = "1.0.0"
+def baseVersion = "1.0.0-SNAPSHOT"
 
 def commonSettings: Seq[Setting[_]] = Seq(
   scalaVersion := scala212,
@@ -43,7 +43,12 @@ lazy val lmRoot = (project in file("."))
         scalafmtOnCompile := true,
         // scalafmtVersion 1.0.0-RC3 has regression
         scalafmtVersion := "0.6.8",
-        git.baseVersion := baseVersion
+        git.baseVersion := baseVersion,
+        version := {
+          val v = version.value
+          if (v contains "SNAPSHOT") git.baseVersion.value
+          else v
+        }
       )),
     commonSettings,
     name := "LM Root",
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 561601327..6c618249f 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -55,7 +55,7 @@ object Dependencies {
   val jsch = "com.jcraft" % "jsch" % "0.1.46" intransitive ()
   val scalaReflect = Def.setting { "org.scala-lang" % "scala-reflect" % scalaVersion.value }
   val scalaXml = scala211Module("scala-xml", "1.0.5")
-  val sjsonnewVersion = "0.7.0"
+  val sjsonnewVersion = "0.8.0-M1"
   val sjsonnewScalaJson = "com.eed3si9n" %% "sjson-new-scalajson" % sjsonnewVersion
   val gigahorseOkhttp = "com.eed3si9n" %% "gigahorse-okhttp" % "0.3.0"
   val okhttpUrlconnection = "com.squareup.okhttp3" % "okhttp-urlconnection" % "3.7.0"