summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2014-03-17 13:16:13 +0100
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2014-03-17 17:14:55 +0100
commitb54c6fae14af2dd298154bb37d7075d047e11bd9 (patch)
tree58f00e3a0be9d0a3b6e0a506626ae2493588314e
parentd0de5a9e8a6c6fe7c65c8245259fc2c0843f5d44 (diff)
downloadspray-json-b54c6fae14af2dd298154bb37d7075d047e11bd9.tar.gz
spray-json-b54c6fae14af2dd298154bb37d7075d047e11bd9.tar.bz2
spray-json-b54c6fae14af2dd298154bb37d7075d047e11bd9.zip
Update to sbt 0.13.1.
Also, update to latest versions of sbt plugins used in spray-json build.
-rw-r--r--build.sbt2
-rw-r--r--project/build.properties2
-rw-r--r--project/plugins.sbt4
3 files changed, 4 insertions, 4 deletions
diff --git a/build.sbt b/build.sbt
index fe859e6..5195b9b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -40,7 +40,7 @@ libraryDependencies ++= {
})
}
-scaladocOptions <<= (name, version).map { (n, v) => Seq("-doc-title", n + " " + v) }
+(scalacOptions in doc) <<= (name, version).map { (n, v) => Seq("-doc-title", n + " " + v) }
// generate boilerplate
Boilerplate.settings
diff --git a/project/build.properties b/project/build.properties
index f069b10..37b489c 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.4 \ No newline at end of file
+sbt.version=0.13.1
diff --git a/project/plugins.sbt b/project/plugins.sbt
index e706598..b0664ad 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,5 @@
-addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.2")
+addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.3")
addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.5.1")
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.5.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")