Merge branch '1.0' of github.com:sbt/util into cleaning

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,
@@ -40,9 +26,9 @@ def commonSettings: Seq[Setting[_]] = Seq(
     "-Yno-adapted-args",
     "-Ywarn-dead-code",
     "-Ywarn-numeric-widen",
-    "-Ywarn-value-discard")
-  // bintrayPackage := (bintrayPackage in ThisBuild).value,
-  // bintrayRepository := (bintrayRepository in ThisBuild).value
+    "-Ywarn-value-discard"),
+  bintrayPackage := (bintrayPackage in ThisBuild).value,
+  bintrayRepository := (bintrayRepository in ThisBuild).value
 )
 
 def testedBaseSettings: Seq[Setting[_]] =
@@ -55,11 +41,29 @@ 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 := {},
-    publishLocal := {}
+    publishLocal := {},
+    publishArtifact := false
   )
 
 // defines Java structures used across Scala versions, such as the API structures and relationships extracted by

project/bintray.sbt

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