diff options
| author | Ivan Topolnak <ivantopo@gmail.com> | 2013-06-03 12:46:56 -0300 |
|---|---|---|
| committer | Ivan Topolnak <ivantopo@gmail.com> | 2013-06-03 12:46:56 -0300 |
| commit | 695b9b6d2bdf55afd7fe420d9a6fc36d3d45ed31 (patch) | |
| tree | aff9e74f6b5838f186ba8ef9e6053d9ad4c84ea2 /project | |
| parent | cad83e95166d91225e126aa6a0fab493b3baca59 (diff) | |
| parent | da47788738055e4fef1485f2721c6ee040c16fd8 (diff) | |
| download | Kamon-695b9b6d2bdf55afd7fe420d9a6fc36d3d45ed31.tar.gz Kamon-695b9b6d2bdf55afd7fe420d9a6fc36d3d45ed31.tar.bz2 Kamon-695b9b6d2bdf55afd7fe420d9a6fc36d3d45ed31.zip | |
Merged the aspects-refactor changes
Diffstat (limited to 'project')
| -rw-r--r-- | project/Build.scala | 6 | ||||
| -rw-r--r-- | project/Dependencies.scala | 1 | ||||
| -rw-r--r-- | project/NewRelic.scala | 13 | ||||
| -rw-r--r-- | project/Settings.scala | 3 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
5 files changed, 22 insertions, 3 deletions
diff --git a/project/Build.scala b/project/Build.scala index fe775462..37765ccf 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -3,6 +3,7 @@ import Keys._ object Build extends Build { import AspectJ._ + import NewRelic._ import Settings._ import Dependencies._ @@ -10,10 +11,11 @@ object Build extends Build { .settings(basicSettings: _*) .settings(revolverSettings: _*) .settings(aspectJSettings: _*) + .settings(newrelicSettings: _*) .settings( libraryDependencies ++= - compile(akkaActor, sprayCan, sprayClient, sprayRouting, sprayServlet, aspectJ, metrics, newrelic, sprayJson) ++ + compile(akkaActor, akkaAgent, sprayCan, sprayClient, sprayRouting, sprayServlet, aspectJ, metrics, newrelic, sprayJson) ++ test(scalatest, sprayTestkit)) -} +}
\ No newline at end of file diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 782379da..a0d51a39 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -15,6 +15,7 @@ object Dependencies { val sprayJson = "io.spray" %% "spray-json" % "1.2.3" val scalaReflect = "org.scala-lang" % "scala-reflect" % "2.10.1" val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.1.2" + val akkaAgent = "com.typesafe.akka" %% "akka-agent" % "2.1.2" val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % "2.1.2" val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % "2.1.2" val scalatest = "org.scalatest" % "scalatest_2.10" % "2.0.M5b" diff --git a/project/NewRelic.scala b/project/NewRelic.scala new file mode 100644 index 00000000..766eb28d --- /dev/null +++ b/project/NewRelic.scala @@ -0,0 +1,13 @@ +import sbt.Keys._ +import com.ivantopo.sbt.newrelic.SbtNewrelic +import com.ivantopo.sbt.newrelic.SbtNewrelic.newrelic +import com.ivantopo.sbt.newrelic.SbtNewrelic.SbtNewrelicKeys._ + + +object NewRelic { + + lazy val newrelicSettings = SbtNewrelic.newrelicSettings ++ Seq( + javaOptions in run <++= jvmOptions in newrelic, + newrelicVersion in newrelic := "2.18.0" + ) +} diff --git a/project/Settings.scala b/project/Settings.scala index de8a3024..640a8013 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -8,8 +8,9 @@ object Settings { lazy val basicSettings = seq( version := VERSION, organization := "com.despegar", - scalaVersion := "2.10.1", + scalaVersion := "2.10.0", resolvers ++= Dependencies.resolutionRepos, + fork in run := true, scalacOptions := Seq( "-encoding", "utf8", diff --git a/project/plugins.sbt b/project/plugins.sbt index 92902e2b..f8ce9e3c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,3 +6,5 @@ addSbtPlugin("io.spray" % "sbt-revolver" % "0.6.2") addSbtPlugin("com.typesafe.sbt" % "sbt-aspectj" % "0.9.0") +addSbtPlugin("com.ivantopo.sbt" % "sbt-newrelic" % "0.0.1") + |