= sbt: upgrade to Scala 2.10.3 and latest versions of dependencies

spray · Oct 22, 2013 · a386930 · a386930
1 parent d7a0901
commit a386930
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -23,7 +23,7 @@ object BuildSettings {
                              "web services on top of Akka",
     startYear             := Some(2011),
     licenses              := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt")),
-    scalaVersion          := "2.10.2",
+    scalaVersion          := "2.10.3",
     resolvers             ++= Dependencies.resolutionRepos,
     scalacOptions         := Seq(
       "-encoding", "utf8",

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -13,24 +13,24 @@ object Dependencies {
   def runtime   (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "runtime")
   def container (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "container")
 
-  val scalaReflect  = "org.scala-lang"                          %   "scala-reflect"               % "2.10.2"
+  val scalaReflect  = "org.scala-lang"                          %   "scala-reflect"               % "2.10.3"
   val akkaActor     = "com.typesafe.akka"                       %%  "akka-actor"                  % "2.1.4"
   val akkaSlf4j     = "com.typesafe.akka"                       %%  "akka-slf4j"                  % "2.1.4"
   val akkaTestKit   = "com.typesafe.akka"                       %%  "akka-testkit"                % "2.1.4"
-  val parboiled     = "org.parboiled"                           %%  "parboiled-scala"             % "1.1.5"
+  val parboiled     = "org.parboiled"                           %%  "parboiled-scala"             % "1.1.6"
   val shapeless     = "com.chuusai"                             %%  "shapeless"                   % "1.2.4"
   val scalatest     = "org.scalatest"                           %%  "scalatest"                   % "1.9.1"
-  val specs2        = "org.specs2"                              %%  "specs2"                      % "1.14"
+  val specs2        = "org.specs2"                              %%  "specs2"                      % "2.2.3"
   val sprayJson     = "io.spray"                                %%  "spray-json"                  % "1.2.5"
   val twirlApi      = "io.spray"                                %%  "twirl-api"                   % "0.6.2"
   val clHashMap     = "com.googlecode.concurrentlinkedhashmap"  %   "concurrentlinkedhashmap-lru" % "1.4"
-  val jettyWebApp   = "org.eclipse.jetty"                       %   "jetty-webapp"                % "8.1.11.v20130520"
+  val jettyWebApp   = "org.eclipse.jetty"                       %   "jetty-webapp"                % "8.1.13.v20130916"
   val servlet30     = "org.eclipse.jetty.orbit"                 %   "javax.servlet"               % "3.0.0.v201112011016" artifacts Artifact("javax.servlet", "jar", "jar")
   val logback       = "ch.qos.logback"                          %   "logback-classic"             % "1.0.13"
   val mimepull      = "org.jvnet.mimepull"                      %   "mimepull"                    % "1.9.3"
   val liftJson      = "net.liftweb"                             %%  "lift-json"                   % "2.5.1"
-  val json4sNative  = "org.json4s"                              %%  "json4s-native"               % "3.2.4"
-  val json4sJackson = "org.json4s"                              %%  "json4s-jackson"              % "3.2.4"
+  val json4sNative  = "org.json4s"                              %%  "json4s-native"               % "3.2.5"
+  val json4sJackson = "org.json4s"                              %%  "json4s-jackson"              % "3.2.5"
   val playJson      = "com.typesafe.play"                       %%  "play-json"                   % "2.2.0"
 }
 
diff --git a/site/src/test/scala/spray/site/RootNodeSpec.scala b/site/src/test/scala/spray/site/RootNodeSpec.scala
@@ -30,6 +30,7 @@ class RootNodeSpec extends Specification {
     "properly find a node by uri" in {
       //      RootNode.find("documentation/spray-io/big-picture/").toString ===
       //        "Some(Big Picture: documentation/spray-io/big-picture/)"
+      pending
     }
   }
 

diff --git a/spray-caching/src/test/scala/spray/caching/ExpiringLruCacheSpec.scala b/spray-caching/src/test/scala/spray/caching/ExpiringLruCacheSpec.scala
@@ -44,7 +44,7 @@ class ExpiringLruCacheSpec extends Specification with NoTimeConversions {
     "return stored values upon cache hit on existing values" in {
       val cache = lruCache[String]()
       cache(1)("A").await === "A"
-      cache(1)(failure("Cached expression was evaluated despite a cache hit"): String).await === "A"
+      cache(1)(failure("Cached expression was evaluated despite a cache hit").asInstanceOf[String]).await === "A"
       cache.store.toString === "{1=A}"
       cache.size === 1
     }

diff --git a/spray-http/src/test/scala/spray/http/HttpDataSpec.scala b/spray-http/src/test/scala/spray/http/HttpDataSpec.scala
@@ -19,6 +19,7 @@ package spray.http
 import java.io.File
 import org.parboiled.common.FileUtils
 import org.specs2.mutable.Specification
+import org.specs2.matcher.MatchResult
 import akka.util.ByteString
 
 class HttpDataSpec extends Specification {
@@ -121,7 +122,7 @@ class HttpDataSpec extends Specification {
     }
   }
 
-  def testCopyToArray(data: HttpData): Unit = {
+  def testCopyToArray(data: HttpData): MatchResult[Any] = {
     testCopyToArray(data, sourceOffset = 0, targetOffset = 0, span = 12) === "Ken sent me!xxxx"
     testCopyToArray(data, sourceOffset = 0, targetOffset = 2, span = 12) === "xxKen sent me!xx"
     testCopyToArray(data, sourceOffset = 0, targetOffset = 4, span = 12) === "xxxxKen sent me!"