diff options
Diffstat (limited to 'project')
| -rw-r--r-- | project/Dependencies.scala | 2 | ||||
| -rw-r--r-- | project/Projects.scala | 10 | ||||
| -rw-r--r-- | project/Settings.scala | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 667f8dce..4a2f2276 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -35,7 +35,7 @@ object Dependencies { 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 def compile (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "compile") def provided (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "provided") diff --git a/project/Projects.scala b/project/Projects.scala index 5d747e49..1043ae58 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -14,10 +14,13 @@ object Projects extends Build { lazy val kamonCore = Project("kamon-core", file("kamon-core")) + .dependsOn(kamonMacros) .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, aspectjWeaver, hdrHistogram, jsr166) ++ provided(logback) ++ @@ -81,13 +84,18 @@ object Projects extends Build { .settings(formatSettings: _*) .settings(libraryDependencies ++= compile(akkaActor) ++ test(scalatest, akkaTestKit, slf4Api, slf4nop)) .dependsOn(kamonCore) - + lazy val kamonDatadog = Project("kamon-datadog", file("kamon-datadog")) .settings(basicSettings: _*) .settings(formatSettings: _*) .settings(libraryDependencies ++= compile(akkaActor) ++ test(scalatest, akkaTestKit, slf4Api, slf4nop)) .dependsOn(kamonCore) + lazy val kamonMacros = Project("kamon-macros", file("kamon-macros")) + .settings(basicSettings: _*) + .settings(formatSettings: _*) + .settings(noPublishing: _*) + .settings(libraryDependencies ++= compile(scalaCompiler)) val noPublishing = Seq(publish := (), publishLocal := (), publishArtifact := false) } diff --git a/project/Settings.scala b/project/Settings.scala index 9abd5553..5805192e 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -8,8 +8,10 @@ import scalariform.formatter.preferences._ object Settings { - lazy val basicSettings = seq( - scalaVersion := "2.10.3", + val ScalaVersion = "2.10.3" + + lazy val basicSettings = Seq( + scalaVersion := ScalaVersion, resolvers ++= Dependencies.resolutionRepos, fork in run := true, scalacOptions := Seq( |