diff options
Diffstat (limited to 'project')
| -rw-r--r-- | project/Dependencies.scala | 1 | ||||
| -rw-r--r-- | project/Projects.scala | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 88be670c..9f5d7051 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -32,7 +32,6 @@ object Dependencies { val playTest = "org.scalatestplus" %% "play" % "1.0.1" val slf4Api = "org.slf4j" % "slf4j-api" % slf4jVersion val slf4nop = "org.slf4j" % "slf4j-nop" % slf4jVersion - val jsr166 = "io.gatling" % "jsr166e" % "1.0" val scalaCompiler = "org.scala-lang" % "scala-compiler" % Settings.ScalaVersion val sigar = "org.fusesource" % "sigar" % "1.6.4" diff --git a/project/Projects.scala b/project/Projects.scala index 815b3a2d..b2f0d9ec 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -23,16 +23,19 @@ object Projects extends Build { mappings in (Compile, packageBin) ++= mappings.in(kamonMacros, Compile, packageBin).value, mappings in (Compile, packageSrc) ++= mappings.in(kamonMacros, Compile, packageSrc).value, libraryDependencies ++= - compile(akkaActor, aspectJ, aspectjWeaver, hdrHistogram, jsr166) ++ - provided(logback) ++ + compile(akkaActor, aspectJ, hdrHistogram) ++ + provided(logback, aspectjWeaver) ++ test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, logback)) lazy val kamonSpray = Project("kamon-spray", file("kamon-spray")) + .dependsOn(kamonMacros % "compile-internal, test-internal") .settings(basicSettings: _*) .settings(formatSettings: _*) .settings(aspectJSettings: _*) .settings( + mappings in (Compile, packageBin) ++= mappings.in(kamonMacros, Compile, packageBin).value, + mappings in (Compile, packageSrc) ++= mappings.in(kamonMacros, Compile, packageSrc).value, libraryDependencies ++= compile(akkaActor, aspectJ, sprayCan, sprayClient, sprayRouting) ++ test(scalatest, akkaTestKit, sprayTestkit, slf4Api, slf4nop)) @@ -71,7 +74,7 @@ object Projects extends Build { lazy val kamonTestkit = Project("kamon-testkit", file("kamon-testkit")) .settings(basicSettings: _*) .settings(formatSettings: _*) - .settings(libraryDependencies ++= compile(akkaActor, akkaTestKit) ++ test(slf4Api, slf4nop)) + .settings(libraryDependencies ++= compile(akkaActor, akkaTestKit, aspectJ) ++ test(slf4Api, slf4nop)) .dependsOn(kamonCore) lazy val kamonPlay = Project("kamon-play", file("kamon-play")) |