diff options
| author | Ivan Topolnak <ivantopo@gmail.com> | 2013-10-02 19:01:00 -0300 |
|---|---|---|
| committer | Ivan Topolnak <ivantopo@gmail.com> | 2013-10-02 19:01:00 -0300 |
| commit | 0b62687fd294de343ae90824f4d570e4273586c1 (patch) | |
| tree | 6b68e1bd5357ba0a0effe27cc800b50194bcfdc5 /project | |
| parent | df99b59fd05c5f5e6a4b48bb5e3485449a6d6eda (diff) | |
| download | Kamon-0b62687fd294de343ae90824f4d570e4273586c1.tar.gz Kamon-0b62687fd294de343ae90824f4d570e4273586c1.tar.bz2 Kamon-0b62687fd294de343ae90824f4d570e4273586c1.zip | |
Switched to DynamicVariables, solve context passing issue produced by runnable batching
Diffstat (limited to 'project')
| -rw-r--r-- | project/AspectJ.scala | 3 | ||||
| -rw-r--r-- | project/Build.scala | 5 | ||||
| -rw-r--r-- | project/Dependencies.scala | 2 | ||||
| -rw-r--r-- | project/Settings.scala | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/project/AspectJ.scala b/project/AspectJ.scala index fb5d8bf9..b6c5037a 100644 --- a/project/AspectJ.scala +++ b/project/AspectJ.scala @@ -10,6 +10,9 @@ object AspectJ { compileOnly in Aspectj := true, fork in Test := true, javaOptions in Test <++= weaverOptions in Aspectj, + fork in run := true, + javaOptions in run <++= weaverOptions in Aspectj, + lintProperties in Aspectj += "invalidAbsoluteTypeName = ignore" // Add this line if we need to include some .aj aspects again in the project. diff --git a/project/Build.scala b/project/Build.scala index 80bc5d32..1e5c9a2f 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -19,11 +19,12 @@ object Build extends Build { .settings(basicSettings: _*) .settings(revolverSettings: _*) .settings(aspectJSettings: _*) - .settings(newrelicSettings: _*) + //.settings(newrelicSettings: _*) .settings( libraryDependencies ++= - compile(akkaActor, akkaAgent, sprayCan, sprayClient, sprayRouting, aspectJ, aspectJWeaver, metrics, sprayJson, newrelic) ++ + compile(akkaActor, akkaAgent, aspectJ, aspectJWeaver, metrics, newrelic, sprayJson) ++ + provided(sprayCan, sprayClient, sprayRouting) ++ test(scalatest, akkaTestKit, sprayTestkit)) //.dependsOn(kamonDashboard) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index bf139b19..66852801 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -14,7 +14,7 @@ object Dependencies { val sprayRouting = "io.spray" % "spray-routing" % sprayVersion val sprayTestkit = "io.spray" % "spray-testkit" % sprayVersion val sprayClient = "io.spray" % "spray-client" % sprayVersion - val sprayJson = "io.spray" %% "spray-json" % "1.2.3" + val sprayJson = "io.spray" %% "spray-json" % "1.2.5" val scalaReflect = "org.scala-lang" % "scala-reflect" % "2.10.1" val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion val akkaAgent = "com.typesafe.akka" %% "akka-agent" % akkaVersion diff --git a/project/Settings.scala b/project/Settings.scala index 6aca813f..9633b405 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -3,7 +3,7 @@ import Keys._ import spray.revolver.RevolverPlugin.Revolver object Settings { - val VERSION = "0.0.2" + val VERSION = "0.0.3" lazy val basicSettings = seq( version := VERSION, |