diff options
| author | Diego <diegolparra@gmail.com> | 2014-05-09 16:03:44 -0300 |
|---|---|---|
| committer | Diego <diegolparra@gmail.com> | 2014-05-09 16:03:44 -0300 |
| commit | f58c5d58b8b93f22992cc6b6a13a6405627aa1a1 (patch) | |
| tree | a101532eec5e94a26293a2215c70e510e419127e /project | |
| parent | d6f2150575ce731e9bd2a8e1ae6c3e84cdf46abb (diff) | |
| download | Kamon-f58c5d58b8b93f22992cc6b6a13a6405627aa1a1.tar.gz Kamon-f58c5d58b8b93f22992cc6b6a13a6405627aa1a1.tar.bz2 Kamon-f58c5d58b8b93f22992cc6b6a13a6405627aa1a1.zip | |
+ play: upgrade version to 2.3.RC1 and change Specs2 for ScalaTests
Diffstat (limited to 'project')
| -rw-r--r-- | project/Dependencies.scala | 6 | ||||
| -rw-r--r-- | project/Projects.scala | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala index fcbb5945..e56a2bd1 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -3,13 +3,12 @@ import sbt._ object Dependencies { val resolutionRepos = Seq( - "spray repo" at "http://repo.spray.io/", + "spray repo" at "http://repo.spray.io/", "typesafe repo" at "http://repo.typesafe.com/typesafe/releases/" ) 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" @@ -29,8 +28,7 @@ object Dependencies { val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion 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 playTest = "org.scalatestplus" %% "play" % "1.1.0-RC1" val slf4Api = "org.slf4j" % "slf4j-api" % slf4jVersion val slf4nop = "org.slf4j" % "slf4j-nop" % slf4jVersion val jsr166 = "io.gatling" % "jsr166e" % "1.0" diff --git a/project/Projects.scala b/project/Projects.scala index c24982b9..73f8f237 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, playWS, aspectJ) ++ test(playTest, playWS, slf4Api)) + .settings(libraryDependencies ++= compile(playTest, aspectJ) ++ test(playTest, slf4Api)) .dependsOn(kamonCore) lazy val kamonStatsd = Project("kamon-statsd", file("kamon-statsd")) |