Upgrade SBT and plugins, remove Scala 2.9 support, bump version to 1.3-SNAPSHOT

7 files changed, 17 insertions, 134 deletions

diff --git a/build.sbt b/build.sbt
index b3d8a17..0c4c7ef 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
 name := "spray-json"
 
-version := "1.2.6"
+version := "1.3.0-SNAPSHOT"
 
 organization := "io.spray"
 
@@ -14,33 +14,19 @@ startYear := Some(2011)
 
 licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt"))
 
-scalaVersion := "2.11.0"
+scalaVersion := "2.11.2"
 
-scalacOptions <<= scalaVersion map {
-  case "2.9.3"  => Seq("-unchecked", "-deprecation", "-encoding", "utf8")
-  case _ => Seq("-feature", "-language:implicitConversions", "-unchecked", "-deprecation", "-encoding", "utf8")
-}
+scalacOptions ++= Seq("-feature", "-language:_", "-unchecked", "-deprecation", "-encoding", "utf8")
 
 resolvers += Opts.resolver.sonatypeReleases
 
-libraryDependencies ++= {
-  Seq("org.parboiled" %% "parboiled-scala" % "1.1.6" % "compile") ++
-  (scalaVersion.value match {
-    case "2.9.3"  =>
-      Seq(
-        "org.specs2" %% "specs2" % "1.12.4.1" % "test",
-        "org.scalacheck" %% "scalacheck" % "1.10.0" % "test"
-      )
-    // Scala 2.10 and Scala 2.11
-    case _ =>
-      Seq(
-        "org.specs2" %% "specs2" % "2.3.11" % "test",
-        "org.scalacheck" %% "scalacheck" % "1.11.3" % "test"
-      )
-  })
-}
-
-(scalacOptions in doc) <<= (name, version).map { (n, v) => Seq("-doc-title", n + " " + v) }
+libraryDependencies ++= Seq(
+  "org.parboiled" %% "parboiled-scala" % "1.1.6" % "compile",
+  "org.specs2" %% "specs2" % "2.4.2" % "test",
+  "org.scalacheck" %% "scalacheck" % "1.11.5" % "test"
+)
+
+(scalacOptions in doc) ++= Seq("-doc-title", name.value + " " + version.value)
 
 // generate boilerplate
 Boilerplate.settings
@@ -60,32 +46,17 @@ OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-
 // publishing
 ///////////////
 
-crossScalaVersions := Seq("2.9.3", "2.10.4", "2.11.0")
+crossScalaVersions := Seq("2.10.4", "2.11.2")
 
 scalaBinaryVersion <<= scalaVersion(sV => if (CrossVersion.isStable(sV)) CrossVersion.binaryScalaVersion(sV) else sV)
 
 publishMavenStyle := true
 
-publishTo <<= version { version =>
-  Some {
+publishTo := Some {
     "spray repo" at {
       // public uri is repo.spray.io, we use an SSH tunnel to the nexus here
       "http://localhost:42424/content/repositories/" + {
-        if (version.trim.endsWith("SNAPSHOT")) "snapshots/" else"releases/"
+        if (version.value.trim.endsWith("SNAPSHOT")) "snapshots/" else "releases/"
       }
     }
-  }
-}
-
-
-///////////////
-// ls-sbt
-///////////////
-
-seq(lsSettings:_*)
-
-(LsKeys.tags in LsKeys.lsync) := Seq("json")
-
-(LsKeys.docsUrl in LsKeys.lsync) := Some(new URL("http://spray.github.com/spray/api/spray-json/"))
-
-(externalResolvers in LsKeys.lsync) := Seq("spray repo" at "http://repo.spray.io")
+  }
\ No newline at end of file
diff --git a/project/build.properties b/project/build.properties
index 8ac605a..64abd37 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.2
+sbt.version=0.13.6
diff --git a/project/plugins.sbt b/project/plugins.sbt
index b0664ad..0db6254 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,3 @@
-addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.3")
+addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.5.9")
 
-addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.5.1")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")
\ No newline at end of file
diff --git a/src/main/ls/1.1.0.json b/src/main/ls/1.1.0.json
deleted file mode 100644
index 6e3df7e..0000000
--- a/src/main/ls/1.1.0.json
+++ /dev/null
@@ -1,22 +0,0 @@
-
-{
- "organization":"cc.spray",
- "name":"spray-json",
- "version":"1.1.0",
- "description":"A Scala library for easy and idiomatic JSON (de)serialization",
- "site":"https://github.com/spray/spray-json",
- "tags":["json"],
- "docs":"http://spray.github.com/spray/api/spray-json/",
- "licenses": [{
-   "name": "Apache 2",
-   "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
-  }],
- "resolvers": ["http://repo.spray.io"],
- "dependencies": [{
-   "organization":"org.parboiled",
-   "name": "parboiled-scala",
-   "version": "1.0.2"
-  }],
- "scalas": ["2.9.1"],
- "sbt": false
-}
\ No newline at end of file
diff --git a/src/main/ls/1.1.1.json b/src/main/ls/1.1.1.json
deleted file mode 100644
index 9bc7660..0000000
--- a/src/main/ls/1.1.1.json
+++ /dev/null
@@ -1,22 +0,0 @@
-
-{
- "organization":"cc.spray",
- "name":"spray-json",
- "version":"1.1.1",
- "description":"A Scala library for easy and idiomatic JSON (de)serialization",
- "site":"https://github.com/spray/spray-json",
- "tags":["json"],
- "docs":"http://spray.github.com/spray/api/spray-json/",
- "licenses": [{
-   "name": "Apache 2",
-   "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
-  }],
- "resolvers": ["http://repo.spray.io"],
- "dependencies": [{
-   "organization":"org.parboiled",
-   "name": "parboiled-scala",
-   "version": "1.0.2"
-  }],
- "scalas": ["2.9.1"],
- "sbt": false
-}
\ No newline at end of file
diff --git a/src/main/ls/1.2.2.json b/src/main/ls/1.2.2.json
deleted file mode 100644
index 3daed44..0000000
--- a/src/main/ls/1.2.2.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "organization" : "io.spray",
-  "name" : "spray-json",
-  "version" : "1.2.2",
-  "description" : "A Scala library for easy and idiomatic JSON (de)serialization",
-  "site" : "https://github.com/spray/spray-json",
-  "tags" : [ "json" ],
-  "docs" : "http://spray.github.com/spray/api/spray-json/",
-  "resolvers" : [ "http://repo.spray.io" ],
-  "dependencies" : [ {
-    "organization" : "org.parboiled",
-    "name" : "parboiled-scala",
-    "version" : "1.1.3"
-  } ],
-  "scalas" : [ "2.9.2", "2.10.0-RC1" ],
-  "licenses" : [ {
-    "name" : "Apache 2",
-    "url" : "http://www.apache.org/licenses/LICENSE-2.0.txt"
-  } ],
-  "sbt" : false
-}
\ No newline at end of file
diff --git a/src/main/ls/1.2.json b/src/main/ls/1.2.json
deleted file mode 100644
index d085d99..0000000
--- a/src/main/ls/1.2.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "organization" : "io.spray",
-  "name" : "spray-json",
-  "version" : "1.2",
-  "description" : "A Scala library for easy and idiomatic JSON (de)serialization",
-  "site" : "https://github.com/spray/spray-json",
-  "tags" : [ "json" ],
-  "docs" : "http://spray.github.com/spray/api/spray-json/",
-  "resolvers" : [ "http://repo.spray.io" ],
-  "dependencies" : [ {
-    "organization" : "org.parboiled",
-    "name" : "parboiled-scala",
-    "version" : "1.1.1"
-  } ],
-  "scalas" : [ "2.9.2" ],
-  "licenses" : [ {
-    "name" : "Apache 2",
-    "url" : "http://www.apache.org/licenses/LICENSE-2.0.txt"
-  } ],
-  "sbt" : false
-}
\ No newline at end of file