From 958ba4dec80f39b4a57884321ce20f2a704e2724 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 16 Jan 2017 11:43:37 -0500
Subject: [PATCH 1/2] sbt 1.0 nightly

---
 build.sbt                            | 2 +-
 src/main/conscript/xsbt/launchconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 85dfec581..2b6450fe4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -14,7 +14,7 @@ def buildLevelSettings: Seq[Setting[_]] = inThisBuild(Seq(
   description := "sbt is an interactive build tool",
   bintrayOrganization := Some("sbt"),
   bintrayRepository := {
-    if (!isSnapshot.value) "maven-releases"
+    if (publishStatus.value == "releases") "maven-releases"
     else "maven-snapshots"
   },
   bintrayPackage := "sbt",
diff --git a/src/main/conscript/xsbt/launchconfig b/src/main/conscript/xsbt/launchconfig
index 033dc550b..d0f3404a5 100644
--- a/src/main/conscript/xsbt/launchconfig
+++ b/src/main/conscript/xsbt/launchconfig
@@ -15,6 +15,7 @@
   maven-central
   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-maven-snapshots: https://repo.scala-sbt.org/scalasbt/maven-snapshots/, bootOnly
 
 [boot]
   directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/}

From 4447b7a1af81e1157375e87fd958626e0ae4e2b2 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 16 Jan 2017 11:44:03 -0500
Subject: [PATCH 2/2] Fix xml and parser-combinator versions

---
 project/Dependencies.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 0f21abddc..33c46f818 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -101,6 +101,6 @@ object Dependencies {
     }
   )
 
-  val scalaXml = scala211Module("scala-xml", "1.0.1")
-  val scalaParsers = scala211Module("scala-parser-combinators", "1.0.1")
+  val scalaXml = scala211Module("scala-xml", "1.0.6")
+  val scalaParsers = scala211Module("scala-parser-combinators", "1.0.5")
 }