aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2013-05-24 02:19:19 -0300
committerIvan Topolnjak <ivantopo@gmail.com>2013-05-24 02:19:19 -0300
commit32746f4fca3ebf2edf4a15ada327ae2733676f0b (patch)
treee2885d6ae8f51acbb18549a88d2d05deb1d34868 /project
parenta12e8579e09c5fd8fdf98ba4553f0a232ddfea6b (diff)
downloadKamon-32746f4fca3ebf2edf4a15ada327ae2733676f0b.tar.gz
Kamon-32746f4fca3ebf2edf4a15ada327ae2733676f0b.tar.bz2
Kamon-32746f4fca3ebf2edf4a15ada327ae2733676f0b.zip
switched back to scalatest and created simple instrumentation for futures body
Diffstat (limited to 'project')
-rw-r--r--project/Build.scala2
-rw-r--r--project/Dependencies.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/project/Build.scala b/project/Build.scala
index 601d5089..ce797851 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -13,7 +13,7 @@ object Build extends Build {
.settings(
libraryDependencies ++=
compile(akkaActor, sprayCan, sprayClient, sprayRouting, sprayServlet, aspectJ, metrics, newrelic, metricsScala, sprayJson, guava) ++
- test(specs2, sprayTestkit))
+ test(scalatest, sprayTestkit))
} \ No newline at end of file
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 5b8543c6..83c4155e 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -17,7 +17,7 @@ object Dependencies {
val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.1.2"
val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % "2.1.2"
val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % "2.1.2"
- val specs2 = "org.specs2" %% "specs2" % "1.14"
+ val scalatest = "org.scalatest" % "scalatest_2.10" % "2.0.M5b"
val logback = "ch.qos.logback" % "logback-classic" % "1.0.10"
val aspectJ = "org.aspectj" % "aspectjrt" % "1.7.2"
val metrics = "com.yammer.metrics" % "metrics-core" % "2.2.0"