From 32746f4fca3ebf2edf4a15ada327ae2733676f0b Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Fri, 24 May 2013 02:19:19 -0300 Subject: switched back to scalatest and created simple instrumentation for futures body --- project/Build.scala | 2 +- project/Dependencies.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'project') 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" -- cgit v1.2.3