Revert SBT plugin versions for Scrooge

RB_ID=735979
twitter · Aug 28, 2015 · 2d9d765 · 2d9d765
1 parent 60aa173
commit 2d9d765
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -1,13 +1,14 @@
 import sbt._
 import Keys._
-import bintray.BintrayKeys.{bintray, bintrayOrganization, bintrayRepository}
+import bintray.Plugin._
+import bintray.Keys._
 import com.typesafe.sbt.SbtSite.site
 import com.typesafe.sbt.site.SphinxSupport.Sphinx
 import net.virtualvoid.sbt.graph.Plugin.graphSettings // For dependency-graph
 import pl.project13.scala.sbt.JmhPlugin
-import sbtassembly.AssemblyKeys.assembly
-import sbtbuildinfo.{BuildInfoKey, BuildInfoPlugin}
-import sbtbuildinfo.BuildInfoKeys.{buildInfoKeys, buildInfoPackage}
+import sbtassembly.Plugin._
+import AssemblyKeys._
+import sbtbuildinfo.Plugin._
 import scoverage.ScoverageSbtPlugin
 
 object Scrooge extends Build {
@@ -171,6 +172,7 @@ object Scrooge extends Build {
     settings = Project.defaultSettings ++
       inConfig(Test)(testThriftSettings) ++
       sharedSettings ++
+      assemblySettings ++
       jmockSettings
   ).settings(
     name := "scrooge-generator",
@@ -255,13 +257,16 @@ object Scrooge extends Build {
     id = "scrooge-sbt-plugin",
     base = file("scrooge-sbt-plugin"),
     settings = Project.defaultSettings ++
-      sharedSettings
-  ).enablePlugins(BuildInfoPlugin).settings(
+      sharedSettings ++
+      bintrayPublishSettings ++
+      buildInfoSettings
+  ).settings(
+      sourceGenerators in Compile <+= buildInfo,
       buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
       buildInfoPackage := "com.twitter",
       sbtPlugin := true,
       publishMavenStyle := false,
-      bintrayRepository in bintray := "sbt-plugins",
+      repository in bintray := "sbt-plugins",
       licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0.html")),
       bintrayOrganization in bintray := Some("twittercsl")
   ).dependsOn(scroogeGenerator)
@@ -270,7 +275,8 @@ object Scrooge extends Build {
     id = "scrooge-linter",
     base = file("scrooge-linter"),
     settings = Project.defaultSettings ++
-      sharedSettings
+      sharedSettings ++
+      assemblySettings
   ).settings(
     name := "scrooge-linter"
   ).dependsOn(scroogeGenerator)

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -6,10 +6,10 @@ resolvers += "maven" at "http://repo1.maven.org/maven2/"
 
 resolvers += Classpaths.sbtPluginReleases
 
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.13.0")
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.5.0")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.11.2")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.3.2")
 addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1")
-addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
+addSbtPlugin("me.lessis" % "bintray-sbt" % "0.1.1")
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.5")
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.0.0")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.2.0")