From 3d90d92dbdc11b5a0a7bb654a6f00a3f9952e0f0 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Tue, 9 Jun 2015 17:20:03 +0200
Subject: [PATCH] Fixes the releasing

---
 build.sbt                                    | 10 ++++++----
 ivy/src/main/scala/sbt/CustomPomParser.scala |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.sbt b/build.sbt
index be13ac346..fb6db259f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -14,7 +14,10 @@ def buildLevelSettings: Seq[Setting[_]] = Seq(
   version in ThisBuild := "0.13.9-SNAPSHOT",
   // bintrayOrganization in ThisBuild := None,
   // bintrayRepository in ThisBuild := "test-test-test",
-  bintrayOrganization in ThisBuild := Some("sbt"),
+  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
@@ -487,8 +490,8 @@ def projectsWithMyProvided = allProjects.map(p => p.copy(configurations = (p.con
 lazy val nonRoots = projectsWithMyProvided.map(p => LocalProject(p.id))
 
 def rootSettings = fullDocSettings ++
-  Util.publishPomSettings ++ otherRootSettings ++ Formatting.sbtFilesSettings /*++
-  Transform.conscriptSettings(launchProj)*/
+  Util.publishPomSettings ++ otherRootSettings ++ Formatting.sbtFilesSettings ++
+  Transform.conscriptSettings(bundledLauncherProj)
 def otherRootSettings = Seq(
   Scripted.scriptedPrescripted := { _ => },
   Scripted.scripted <<= scriptedTask,
@@ -619,7 +622,6 @@ def customCommands: Seq[Setting[_]] = Seq(
    */
   commands += Command.command("release-sbt") { state =>
     // TODO - Any sort of validation
-    "checkCredentials" ::
     "clean" ::
     "allPrecompiled/clean" ::
       "allPrecompiled/compile" ::
diff --git a/ivy/src/main/scala/sbt/CustomPomParser.scala b/ivy/src/main/scala/sbt/CustomPomParser.scala
index d37804cbc..be98bfe25 100644
--- a/ivy/src/main/scala/sbt/CustomPomParser.scala
+++ b/ivy/src/main/scala/sbt/CustomPomParser.scala
@@ -78,7 +78,7 @@ object CustomPomParser {
       Option(extraInfo).isDefined &&
         ((Option(extraInfo get TransformedHashKey) orElse Option(extraInfo get oldTransformedHashKey)) match {
           case Some(MyHash) => true
-          case _ => false
+          case _            => false
         })
     }