From fa4a02ff31049bccf93af2c2f073faabdaac8d7a Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Wed, 23 Apr 2014 00:30:18 -0300 Subject: upgrade dependencies to Akka 2.3 compatible versions --- project/Dependencies.scala | 9 +++++---- project/Projects.scala | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 1aefcf4b..e483358d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,13 +7,13 @@ object Dependencies { "typesafe repo" at "http://repo.typesafe.com/typesafe/releases/" ) - val sprayVersion = "1.2.0" - val akkaVersion = "2.2.3" - val playVersion = "2.2.2" + val sprayVersion = "1.3.1" + val akkaVersion = "2.3.2" + val playVersion = "2.3-M1" val aspectjVersion = "1.7.4" val slf4jVersion = "1.7.6" - val sprayJson = "io.spray" %% "spray-json" % "1.2.5" + val sprayJson = "io.spray" %% "spray-json" % "1.2.6" val sprayJsonLenses = "net.virtual-void" %% "json-lenses" % "0.5.3" val scalatest = "org.scalatest" % "scalatest_2.10" % "2.0" val logback = "ch.qos.logback" % "logback-classic" % "1.0.13" @@ -30,6 +30,7 @@ object Dependencies { val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion val playTest = "com.typesafe.play" %% "play-test" % playVersion + val playWS = "com.typesafe.play" %% "play-ws" % playVersion val slf4Api = "org.slf4j" % "slf4j-api" % slf4jVersion val slf4nop = "org.slf4j" % "slf4j-nop" % slf4jVersion diff --git a/project/Projects.scala b/project/Projects.scala index f3f7f17d..87eb781d 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -74,7 +74,7 @@ object Projects extends Build { .settings(basicSettings: _*) .settings(formatSettings: _*) .settings(aspectJSettings: _*) - .settings(libraryDependencies ++= compile(playTest, aspectJ) ++ test(playTest, slf4Api)) + .settings(libraryDependencies ++= compile(playTest, playWS, aspectJ) ++ test(playTest, playWS, slf4Api)) .dependsOn(kamonCore) lazy val kamonStatsd = Project("kamon-statsd", file("kamon-statsd")) -- cgit v1.2.3