Add stuff (it's late, sorry)

buildo · Sep 14, 2016 · 7b55e84 · 7b55e84
1 parent 83f2446
commit 7b55e84
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/build.sbt b/build.sbt
@@ -10,6 +10,8 @@ lazy val root = (project in file(".")).
     name := "sbt-buildo",
     description := "sbt plugin for sharing configuration across projects at buildo",
     addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0"),
+    addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0"),
+    addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3"),
     licenses := Seq("MIT" -> url("https://github.com/buildo/sbt-buildo/blob/master/LICENSE")),
     scmInfo := Some(ScmInfo(url("https://github.com/buildo/sbt-buildo"), "git@github.com:buildo/sbt-buildo.git")),
     bintrayOrganization := Some("buildo"),

diff --git a/src/main/scala/buildo/CommonDependenciesSettingPlugin.scala b/src/main/scala/buildo/CommonDependenciesSettingPlugin.scala
@@ -3,7 +3,6 @@ package buildo
 import sbt._
 import Keys._
 
-
 object CommonDependencySettingPlugin extends AutoPlugin {
 
   object autoImport {
@@ -26,6 +25,7 @@ object CommonDependencySettingPlugin extends AutoPlugin {
       hikari,
       logging,
       sprayJson,
+      metarpheusAnnotations,
       scalaTest,
       sprayTest
     )

diff --git a/src/main/scala/buildo/ScalaSettingPlugin.scala b/src/main/scala/buildo/ScalaSettingPlugin.scala
@@ -16,6 +16,7 @@ object ScalaSettingPlugin extends AutoPlugin {
   )
 
   lazy val baseSettings: Seq[Def.Setting[_]] = Seq(
+    cancelable in Global := true,
     scalacOptions ++= Seq("-encoding", "utf8"),
     scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-Xlint"),
     scalacOptions  += "-language:higherKinds",