diff options
| author | Ivan Topolnak <itopolnak@despegar.com> | 2014-01-02 18:09:53 -0300 |
|---|---|---|
| committer | Ivan Topolnak <itopolnak@despegar.com> | 2014-01-13 17:37:20 -0300 |
| commit | 7a10c0ef2a6566229e8571f6d385ca2ff794cc20 (patch) | |
| tree | cecd7ce6eb7a71f967eaa1605615780fa94d346c /project | |
| parent | 54143e4af6182b967736abc60a7fb20c88dd6587 (diff) | |
| download | Kamon-7a10c0ef2a6566229e8571f6d385ca2ff794cc20.tar.gz Kamon-7a10c0ef2a6566229e8571f6d385ca2ff794cc20.tar.bz2 Kamon-7a10c0ef2a6566229e8571f6d385ca2ff794cc20.zip | |
integrate trace and metrics into the base project
Diffstat (limited to 'project')
| -rw-r--r-- | project/Build.scala | 30 | ||||
| -rw-r--r-- | project/Dependencies.scala | 13 |
2 files changed, 10 insertions, 33 deletions
diff --git a/project/Build.scala b/project/Build.scala index 2b022ba6..c7a0fd5f 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -9,7 +9,7 @@ object Build extends Build { import Dependencies._ lazy val root = Project("root", file(".")) - .aggregate(kamonCore, kamonTrace, kamonMetrics, kamonSpray, kamonNewrelic, kamonPlayground, kamonDashboard) + .aggregate(kamonCore, kamonSpray, kamonNewrelic, kamonPlayground, kamonDashboard) .settings(basicSettings: _*) .settings(formatSettings: _*) .settings(noPublishing: _*) @@ -21,31 +21,9 @@ object Build extends Build { .settings(aspectJSettings: _*) .settings( libraryDependencies ++= - compile(akkaActor, aspectJ, metrics) ++ - test(scalatest, akkaTestKit)) - - - lazy val kamonTrace = Project("kamon-trace", file("kamon-trace")) - .settings(basicSettings: _*) - .settings(formatSettings: _*) - .settings(aspectJSettings: _*) - .settings( - libraryDependencies ++= - compile(akkaActor, aspectJ) ++ + compile(akkaActor, aspectJ, hdrHistogram) ++ provided(logback) ++ test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, logback)) - .dependsOn(kamonCore) - - - lazy val kamonMetrics = Project("kamon-metrics", file("kamon-metrics")) - .settings(basicSettings: _*) - .settings(formatSettings: _*) - .settings(aspectJSettings: _*) - .settings( - libraryDependencies ++= - compile(hdrHistogram, akkaActor, aspectJ, newrelic) ++ - test(scalatest, akkaTestKit, sprayTestkit)) - .dependsOn(kamonCore) lazy val kamonSpray = Project("kamon-spray", file("kamon-spray")) @@ -56,7 +34,7 @@ object Build extends Build { libraryDependencies ++= compile(akkaActor, aspectJ, sprayCan, sprayClient, sprayRouting) ++ test(scalatest, akkaTestKit, sprayTestkit)) - .dependsOn(kamonTrace) + .dependsOn(kamonCore) lazy val kamonNewrelic = Project("kamon-newrelic", file("kamon-newrelic")) @@ -67,7 +45,7 @@ object Build extends Build { libraryDependencies ++= compile(aspectJ, sprayCan, sprayClient, sprayRouting, sprayJson, sprayJsonLenses, newrelic, snakeYaml) ++ test(scalatest, akkaTestKit, sprayTestkit)) - .dependsOn(kamonTrace) + .dependsOn(kamonCore) lazy val kamonPlayground = Project("kamon-playground", file("kamon-playground")) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index eb1f245a..85186ce6 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,20 +12,19 @@ object Dependencies { val sprayJson = "io.spray" %% "spray-json" % "1.2.5" val sprayJsonLenses = "net.virtual-void" %% "json-lenses" % "0.5.3" - val scalatest = "org.scalatest" % "scalatest_2.10" % "2.0.RC2" + val scalatest = "org.scalatest" % "scalatest_2.10" % "2.0" val logback = "ch.qos.logback" % "logback-classic" % "1.0.13" val aspectJ = "org.aspectj" % "aspectjrt" % "1.7.2" - val metrics = "com.codahale.metrics" % "metrics-core" % "3.0.1" val newrelic = "com.newrelic.agent.java" % "newrelic-api" % "3.1.0" - 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 snakeYaml = "org.yaml" % "snakeyaml" % "1.13" + val hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "1.0.8" val sprayCan = "io.spray" % "spray-can" % sprayVersion val sprayRouting = "io.spray" % "spray-routing" % sprayVersion val sprayTestkit = "io.spray" % "spray-testkit" % sprayVersion val sprayClient = "io.spray" % "spray-client" % sprayVersion - val snakeYaml = "org.yaml" % "snakeyaml" % "1.13" - val hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "1.0.8" + val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion + val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion + val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion def compile (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "compile") |