diff options
author | Mathias <mathias@spray.io> | 2014-04-09 10:14:13 +0200 |
---|---|---|
committer | Mathias <mathias@spray.io> | 2014-04-09 10:14:13 +0200 |
commit | 4c3de0447186ecb0b4866b32a4603a4dc40b6ede (patch) | |
tree | 11dcc594ca53b1047f8f93aa55e24efad1a45e29 /build.sbt | |
parent | e633f51e64793145e07a6cc7b87552b7bba3df58 (diff) | |
download | spray-json-4c3de0447186ecb0b4866b32a4603a4dc40b6ede.tar.gz spray-json-4c3de0447186ecb0b4866b32a4603a4dc40b6ede.tar.bz2 spray-json-4c3de0447186ecb0b4866b32a4603a4dc40b6ede.zip |
Upgrade to Scala 2.10.4, parboiled 1.1.6 and specs2 2.3.10
Diffstat (limited to 'build.sbt')
-rw-r--r-- | build.sbt | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -14,21 +14,21 @@ startYear := Some(2011) licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt")) -scalaVersion := "2.10.1" +scalaVersion := "2.10.4" scalacOptions <<= scalaVersion map { case "2.9.3" => Seq("-unchecked", "-deprecation", "-encoding", "utf8") - case "2.10.1" => Seq("-feature", "-language:implicitConversions", "-unchecked", "-deprecation", "-encoding", "utf8") + case "2.10.4" => Seq("-feature", "-language:implicitConversions", "-unchecked", "-deprecation", "-encoding", "utf8") } resolvers += Opts.resolver.sonatypeReleases libraryDependencies <++= scalaVersion { sv => Seq( - "org.parboiled" %% "parboiled-scala" % "1.1.5" % "compile", + "org.parboiled" %% "parboiled-scala" % "1.1.6" % "compile", sv match { case "2.9.3" => "org.specs2" %% "specs2" % "1.12.4.1" % "test" - case "2.10.1" => "org.specs2" %% "specs2" % "1.14" % "test" + case "2.10.4" => "org.specs2" %% "specs2" % "2.3.10" % "test" } ) } @@ -42,7 +42,7 @@ Boilerplate.settings // publishing /////////////// -crossScalaVersions := Seq("2.9.3", "2.10.1") +crossScalaVersions := Seq("2.9.3", "2.10.4") scalaBinaryVersion <<= scalaVersion(sV => if (CrossVersion.isStable(sV)) CrossVersion.binaryScalaVersion(sV) else sV) |