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

1 files changed, 14 insertions, 43 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