luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bump sjson-new to latest

This commit is contained in:
Eugene Yokota 2017-06-28 02:27:41 -04:00
parent e4c1a1c559
commit e8d5bcc600
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.sbt
View File

@ -3,7 +3,7 @@ import Path._
// import com.typesafe.tools.mima.core._, ProblemFilters._ // import com.typesafe.tools.mima.core._, ProblemFilters._
def baseVersion = "1.0.0" def baseVersion = "1.0.0-SNAPSHOT"
def commonSettings: Seq[Setting[_]] = Seq( def commonSettings: Seq[Setting[_]] = Seq(
scalaVersion := scala212, scalaVersion := scala212,
@ -43,7 +43,12 @@ lazy val lmRoot = (project in file("."))
scalafmtOnCompile := true, scalafmtOnCompile := true,
// scalafmtVersion 1.0.0-RC3 has regression // scalafmtVersion 1.0.0-RC3 has regression
scalafmtVersion := "0.6.8", 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, commonSettings,
name := "LM Root", name := "LM Root",

2
project/Dependencies.scala
View File

@ -55,7 +55,7 @@ object Dependencies {
val jsch = "com.jcraft" % "jsch" % "0.1.46" intransitive () val jsch = "com.jcraft" % "jsch" % "0.1.46" intransitive ()
val scalaReflect = Def.setting { "org.scala-lang" % "scala-reflect" % scalaVersion.value } val scalaReflect = Def.setting { "org.scala-lang" % "scala-reflect" % scalaVersion.value }
val scalaXml = scala211Module("scala-xml", "1.0.5") 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 sjsonnewScalaJson = "com.eed3si9n" %% "sjson-new-scalajson" % sjsonnewVersion
val gigahorseOkhttp = "com.eed3si9n" %% "gigahorse-okhttp" % "0.3.0" val gigahorseOkhttp = "com.eed3si9n" %% "gigahorse-okhttp" % "0.3.0"
val okhttpUrlconnection = "com.squareup.okhttp3" % "okhttp-urlconnection" % "3.7.0" val okhttpUrlconnection = "com.squareup.okhttp3" % "okhttp-urlconnection" % "3.7.0"