aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2015-02-15 00:56:46 +0100
committerIvan Topolnjak <ivantopo@gmail.com>2015-02-15 00:56:46 +0100
commitcbe74e89112cfba113a1bba4184b417406e02b98 (patch)
tree818f1293d99dfd1e02645b46ee6682dc5aec7c41 /project
parente931727454fbd97fb39d163255edbcdcd7bcdbc6 (diff)
downloadKamon-cbe74e89112cfba113a1bba4184b417406e02b98.tar.gz
Kamon-cbe74e89112cfba113a1bba4184b417406e02b98.tar.bz2
Kamon-cbe74e89112cfba113a1bba4184b417406e02b98.zip
! build: use the akka-2.2 suffix for all modules.
Diffstat (limited to 'project')
-rw-r--r--project/Publish.scala2
-rw-r--r--project/Settings.scala4
2 files changed, 3 insertions, 3 deletions
diff --git a/project/Publish.scala b/project/Publish.scala
index ddb64d2d..025e258e 100644
--- a/project/Publish.scala
+++ b/project/Publish.scala
@@ -19,7 +19,7 @@ import sbt.Keys._
object Publish {
lazy val settings = Seq(
- crossPaths := true,
+ crossPaths := false,
pomExtra := kamonPomExtra,
publishTo := kamonRepo,
organization := "io.kamon",
diff --git a/project/Settings.scala b/project/Settings.scala
index 700312c1..12f51dc1 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -13,11 +13,10 @@
* =========================================================================================
*/
-import com.typesafe.sbt.SbtAspectj.AspectjKeys._
import sbt.Tests.{SubProcess, Group}
import sbt._
import Keys._
-import com.typesafe.sbt.{SbtAspectj, SbtScalariform}
+import com.typesafe.sbt.SbtScalariform
import com.typesafe.sbt.SbtScalariform.ScalariformKeys
import Publish.{settings => publishSettings}
import Release.{settings => releaseSettings}
@@ -35,6 +34,7 @@ object Settings {
resolvers ++= Dependencies.resolutionRepos,
fork in run := true,
testGrouping in Test := singleTests((definedTests in Test).value, (javaOptions in Test).value),
+ moduleName := moduleName.value + "_akka-2.2",
javacOptions in compile := Seq(
"-Xlint:-options",
"-source", JavaVersion, "-target", JavaVersion