diff options
| author | Ivan Topolnak <ivantopo@gmail.com> | 2013-11-07 18:41:33 -0300 |
|---|---|---|
| committer | Ivan Topolnak <ivantopo@gmail.com> | 2013-11-07 18:41:33 -0300 |
| commit | bf86900669d649308f4914c54e6fe076510506a6 (patch) | |
| tree | d8bf9af9f5c8a946d757137a303f6956c05edb03 /project | |
| parent | 2b63540e5fffab545d0846cfb3dab5c0e1d0c9e1 (diff) | |
| download | Kamon-bf86900669d649308f4914c54e6fe076510506a6.tar.gz Kamon-bf86900669d649308f4914c54e6fe076510506a6.tar.bz2 Kamon-bf86900669d649308f4914c54e6fe076510506a6.zip | |
halfway to our own NewRelic Agent
Diffstat (limited to 'project')
| -rw-r--r-- | project/AspectJ.scala | 1 | ||||
| -rw-r--r-- | project/Build.scala | 2 | ||||
| -rw-r--r-- | project/Dependencies.scala | 2 | ||||
| -rw-r--r-- | project/NewRelic.scala | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/project/AspectJ.scala b/project/AspectJ.scala index 6118aa03..83b334b8 100644 --- a/project/AspectJ.scala +++ b/project/AspectJ.scala @@ -10,6 +10,7 @@ object AspectJ { compileOnly in Aspectj := true, fork in Test := true, javaOptions in Test <++= weaverOptions in Aspectj, + javaOptions in run <++= weaverOptions in Aspectj, lintProperties in Aspectj += "invalidAbsoluteTypeName = ignore" ) }
\ No newline at end of file diff --git a/project/Build.scala b/project/Build.scala index 4f5c758a..323f7f02 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -57,7 +57,7 @@ object Build extends Build { .settings(aspectJSettings: _*) .settings( libraryDependencies ++= - compile(aspectJ, sprayCan, sprayClient, sprayRouting, newrelic) ++ + compile(aspectJ, sprayCan, sprayClient, sprayRouting, sprayJson, sprayJsonLenses, newrelic) ++ test(scalatest, akkaTestKit, sprayTestkit)) .dependsOn(kamonTrace) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 55736c76..0d393005 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,6 +11,7 @@ object Dependencies { val akkaVersion = "2.2.3" 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 logback = "ch.qos.logback" % "logback-classic" % "1.0.13" val aspectJ = "org.aspectj" % "aspectjrt" % "1.7.2" @@ -25,6 +26,7 @@ object Dependencies { val sprayClient = "io.spray" % "spray-client" % sprayVersion + def compile (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "compile") def provided (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "provided") def test (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "test") diff --git a/project/NewRelic.scala b/project/NewRelic.scala index 8841244d..cb26c38c 100644 --- a/project/NewRelic.scala +++ b/project/NewRelic.scala @@ -10,7 +10,7 @@ object NewRelic { lazy val newrelicSettings = SbtNewrelic.newrelicSettings ++ Seq( javaOptions in run <++= jvmOptions in newrelic, fork in run := true, - configFile in newrelic := file("~/.newrelic/kamon_playground.yml"), + configFile in newrelic := file(System.getProperty("user.home") + "/.newrelic/kamon_playground.yml"), newrelicVersion in newrelic := "3.1.0" ) } |