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

Merge pull request #2925 from eed3si9n/wip/nightly 

Fix xml and parser-combinator versions
This commit is contained in:
eugene yokota 2017-01-20 03:59:42 -05:00 committed by GitHub
parent a65576e559 4447b7a1af
commit ce9a022dc3
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -14,7 +14,7 @@ def buildLevelSettings: Seq[Setting[_]] = inThisBuild(Seq(
description := "sbt is an interactive build tool", description := "sbt is an interactive build tool",
bintrayOrganization := Some("sbt"), bintrayOrganization := Some("sbt"),
bintrayRepository := { bintrayRepository := {
if (!isSnapshot.value) "maven-releases" if (publishStatus.value == "releases") "maven-releases"
else "maven-snapshots" else "maven-snapshots"
}, },
bintrayPackage := "sbt", bintrayPackage := "sbt",

4
project/Dependencies.scala
View File

@ -101,6 +101,6 @@ object Dependencies {
} }
) )
val scalaXml = scala211Module("scala-xml", "1.0.1") val scalaXml = scala211Module("scala-xml", "1.0.6")
val scalaParsers = scala211Module("scala-parser-combinators", "1.0.1") val scalaParsers = scala211Module("scala-parser-combinators", "1.0.5")
} }

1
src/main/conscript/xsbt/launchconfig
View File

@ -15,6 +15,7 @@
maven-central maven-central
typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
sbt-ivy-snapshots: https://repo.scala-sbt.org/scalasbt/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly sbt-ivy-snapshots: https://repo.scala-sbt.org/scalasbt/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
sbt-maven-snapshots: https://repo.scala-sbt.org/scalasbt/maven-snapshots/, bootOnly
[boot] [boot]
directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/}