luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes the releasing

This commit is contained in:
Eugene Yokota 2015-06-09 17:20:03 +02:00
parent 5c6cd94fc3
commit 3d90d92dbd
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.sbt
View File

@ -14,7 +14,10 @@ def buildLevelSettings: Seq[Setting[_]] = Seq(
version in ThisBuild := "0.13.9-SNAPSHOT", version in ThisBuild := "0.13.9-SNAPSHOT",
// bintrayOrganization in ThisBuild := None, // bintrayOrganization in ThisBuild := None,
// bintrayRepository in ThisBuild := "test-test-test", // 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}", bintrayRepository in ThisBuild := s"ivy-${(publishStatus in ThisBuild).value}",
bintrayPackage in ThisBuild := "sbt", bintrayPackage in ThisBuild := "sbt",
bintrayReleaseOnPublish in ThisBuild := false 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)) lazy val nonRoots = projectsWithMyProvided.map(p => LocalProject(p.id))
def rootSettings = fullDocSettings ++ def rootSettings = fullDocSettings ++
Util.publishPomSettings ++ otherRootSettings ++ Formatting.sbtFilesSettings /*++ Util.publishPomSettings ++ otherRootSettings ++ Formatting.sbtFilesSettings ++
Transform.conscriptSettings(launchProj)*/ Transform.conscriptSettings(bundledLauncherProj)
def otherRootSettings = Seq( def otherRootSettings = Seq(
Scripted.scriptedPrescripted := { _ => }, Scripted.scriptedPrescripted := { _ => },
Scripted.scripted <<= scriptedTask, Scripted.scripted <<= scriptedTask,
@ -619,7 +622,6 @@ def customCommands: Seq[Setting[_]] = Seq(
*/ */
commands += Command.command("release-sbt") { state => commands += Command.command("release-sbt") { state =>
// TODO - Any sort of validation // TODO - Any sort of validation
"checkCredentials" ::
"clean" :: "clean" ::
"allPrecompiled/clean" :: "allPrecompiled/clean" ::
"allPrecompiled/compile" :: "allPrecompiled/compile" ::

2
ivy/src/main/scala/sbt/CustomPomParser.scala
View File

@ -78,7 +78,7 @@ object CustomPomParser {
Option(extraInfo).isDefined && Option(extraInfo).isDefined &&
((Option(extraInfo get TransformedHashKey) orElse Option(extraInfo get oldTransformedHashKey)) match { ((Option(extraInfo get TransformedHashKey) orElse Option(extraInfo get oldTransformedHashKey)) match {
case Some(MyHash) => true case Some(MyHash) => true
case _ => false case _ => false
}) })
} }