aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorIvan Topolnak <itopolnak@despegar.com>2014-04-24 18:05:37 -0300
committerIvan Topolnak <itopolnak@despegar.com>2014-04-24 18:05:37 -0300
commitfc4c61e1a8d2515b6c7d4ab32400154f490ceccb (patch)
treeaa6878b36613d6c45c2d657fe3679d28e23ed0ea /project
parent5cf929c839883d7a6b28929320efd7a8c525f27b (diff)
parent3b90e0382ea1dd1b66b43beea20aef7007806142 (diff)
downloadKamon-fc4c61e1a8d2515b6c7d4ab32400154f490ceccb.tar.gz
Kamon-fc4c61e1a8d2515b6c7d4ab32400154f490ceccb.tar.bz2
Kamon-fc4c61e1a8d2515b6c7d4ab32400154f490ceccb.zip
Merge branch 'master' into release-0.2
Diffstat (limited to 'project')
-rw-r--r--project/Projects.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/project/Projects.scala b/project/Projects.scala
index f3f7f17d..3be81e84 100644
--- a/project/Projects.scala
+++ b/project/Projects.scala
@@ -87,6 +87,7 @@ object Projects extends Build {
.settings(basicSettings: _*)
.settings(siteSettings: _*)
.settings(aspectJSettings: _*)
+ .settings(noPublishing: _*)
.dependsOn(kamonCore)
.settings(
libraryDependencies ++=
@@ -94,5 +95,5 @@ object Projects extends Build {
test(scalatest, akkaTestKit))
- val noPublishing = Seq(publish := (), publishLocal := ())
+ val noPublishing = Seq(publish := (), publishLocal := (), publishArtifact := false)
}