From e9be0b251d5714a5726d7b90c309a293f146c96c Mon Sep 17 00:00:00 2001 From: Ivan Topolnak Date: Tue, 28 May 2013 17:59:15 -0300 Subject: configured sbt to compile aspectj files --- project/AspectJ.scala | 15 ++++++++------- project/Build.scala | 2 +- project/build.properties | 1 + 3 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 project/build.properties (limited to 'project') diff --git a/project/AspectJ.scala b/project/AspectJ.scala index d708b0db..a711f2be 100644 --- a/project/AspectJ.scala +++ b/project/AspectJ.scala @@ -1,15 +1,16 @@ import sbt._ import sbt.Keys._ -import com.typesafe.sbt.SbtAspectj -import com.typesafe.sbt.SbtAspectj.Aspectj -import com.typesafe.sbt.SbtAspectj.AspectjKeys._ +import com.typesafe.sbt.SbtAspectj.{ Aspectj, aspectjSettings, compiledClasses } +import com.typesafe.sbt.SbtAspectj.AspectjKeys.{ binaries, compileOnly, inputs, lintProperties, weaverOptions } object AspectJ { - lazy val aspectJSettings = SbtAspectj.aspectjSettings ++ Seq( - showWeaveInfo := false, - fork in Test := true, - javaOptions in Test <++= weaverOptions in Aspectj + lazy val aspectJSettings = aspectjSettings ++ Seq( + compileOnly in Aspectj := true, + fork in Test := true, + javaOptions in Test <++= weaverOptions in Aspectj, + //lintProperties in Aspectj <++= "invalidAbsoluteTypeName = ignore", + products in Compile <<= products in Aspectj ) } \ No newline at end of file diff --git a/project/Build.scala b/project/Build.scala index ce797851..3a16b589 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -8,7 +8,7 @@ object Build extends Build { lazy val root = Project("kamon", file(".")) .settings(basicSettings: _*) - .settings(revolverSettings: _*) + //.settings(revolverSettings: _*) .settings(aspectJSettings: _*) .settings( libraryDependencies ++= diff --git a/project/build.properties b/project/build.properties new file mode 100644 index 00000000..db255c25 --- /dev/null +++ b/project/build.properties @@ -0,0 +1 @@ +sbt.version=0.12.3 \ No newline at end of file -- cgit v1.2.3