Add sbt-house-rules and bintray-sbt

build.sbt

@@ -3,20 +3,6 @@ import Util._
 
 def internalPath   = file("internal")
 
-// ThisBuild settings take lower precedence,
-// but can be shared across the multi projects.
-def buildLevelSettings: Seq[Setting[_]] = Seq(
-  organization in ThisBuild := "org.scala-sbt.util",
-  version in ThisBuild := "1.0.0-SNAPSHOT"
-  // bintrayOrganization in ThisBuild :=  {
-  //   if ((publishStatus in ThisBuild).value == "releases") Some("typesafe")
-  //   else Some("sbt")
-  // },
-  // bintrayRepository in ThisBuild := s"ivy-${(publishStatus in ThisBuild).value}",
-  // bintrayPackage in ThisBuild := "sbt",
-  // bintrayReleaseOnPublish in ThisBuild := false
-)
-
 def commonSettings: Seq[Setting[_]] = Seq(
   scalaVersion := "2.10.5",
   // publishArtifact in packageDoc := false,
@@ -26,9 +12,9 @@ def commonSettings: Seq[Setting[_]] = Seq(
   testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"),
   javacOptions in compile ++= Seq("-target", "6", "-source", "6", "-Xlint", "-Xlint:-serial"),
   incOptions := incOptions.value.withNameHashing(true),
-  crossScalaVersions := Seq(scala210, scala211)
-  // bintrayPackage := (bintrayPackage in ThisBuild).value,
-  // bintrayRepository := (bintrayRepository in ThisBuild).value
+  crossScalaVersions := Seq(scala210, scala211),
+  bintrayPackage := (bintrayPackage in ThisBuild).value,
+  bintrayRepository := (bintrayRepository in ThisBuild).value
 )
 
 def testedBaseSettings: Seq[Setting[_]] =
@@ -41,7 +27,24 @@ lazy val utilRoot: Project = (project in file(".")).
     utilLogging, utilRelation, utilLogic, utilCache, utilTracking
   ).
   settings(
-    buildLevelSettings,
+    inThisBuild(Seq(
+      organization := "org.scala-sbt.util",
+      version := "0.1.0-SNAPSHOT",
+      homepage := Some(url("https://github.com/sbt/util")),
+      description := "Util module for sbt",
+      licenses := List("BSD New" -> url("https://github.com/sbt/sbt/blob/0.13/LICENSE")),
+      scmInfo := Some(ScmInfo(url("https://github.com/sbt/util"), "git@github.com:sbt/util.git")),
+      developers := List(
+        Developer("harrah", "Mark Harrah", "@harrah", url("https://github.com/harrah")),
+        Developer("eed3si9n", "Eugene Yokota", "@eed3si9n", url("https://github.com/eed3si9n")),
+        Developer("jsuereth", "Josh Suereth", "@jsuereth", url("https://github.com/jsuereth")),
+        Developer("dwijnand", "Dale Wijnand", "@dwijnand", url("https://github.com/dwijnand"))
+      ),
+      bintrayReleaseOnPublish := false,
+      bintrayOrganization := Some("sbt"),
+      bintrayRepository := "maven-releases",
+      bintrayPackage := "util"
+    )),
     commonSettings,
     name := "Util Root",
     publish := {},

internal/util-complete/src/main/scala/sbt/complete/HistoryCommands.scala

@@ -34,8 +34,7 @@ object HistoryCommands {
     Nth -> ("Execute the command with index n, as shown by the " + ListFull + " command"),
     Previous -> "Execute the nth command before this one",
     StartsWithString -> "Execute the most recent command starting with 'string'",
-    ContainsString -> "Execute the most recent command containing 'string'"
-  )
+    ContainsString -> "Execute the most recent command containing 'string'")
   def helpString = "History commands:\n   " + (descriptions.map { case (c, d) => c + "    " + d }).mkString("\n   ")
   def printHelp(): Unit =
     println(helpString)

internal/util-complete/src/main/scala/sbt/complete/TypeString.scala

@@ -61,8 +61,7 @@ private[sbt] object TypeString {
   val TypeMap = Map(
     "java.io.File" -> "File",
     "java.net.URL" -> "URL",
-    "java.net.URI" -> "URI"
-  )
+    "java.net.URI" -> "URI")
 
   /**
    * A Parser that extracts basic structure from the string representation of a type from Manifest.toString.

internal/util-control/src/main/scala/sbt/ExitHook.scala

@@ -16,6 +16,5 @@ object ExitHooks {
   /** Calls each registered exit hook, trapping any exceptions so that each hook is given a chance to run. */
   def runExitHooks(exitHooks: Seq[ExitHook]): Seq[Throwable] =
     exitHooks.flatMap(hook =>
-      ErrorHandling.wideConvert(hook.runBeforeExiting()).left.toOption
-    )
+      ErrorHandling.wideConvert(hook.runBeforeExiting()).left.toOption)
 }

internal/util-logic/src/main/scala/sbt/logic/Logic.scala

@@ -103,8 +103,7 @@ object Logic {
           checkAcyclic(clauses)
 
       problem.toLeft(
-        reduce0(clauses, initialFacts, Matched.empty)
-      )
+        reduce0(clauses, initialFacts, Matched.empty))
     }
 
   /**

project/bintray.sbt

@@ -0,0 +1 @@
+addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")

project/house.sbt

@@ -0,0 +1 @@
+addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.1.0")