From 08a42eed6d5f6c543bc80af6d03a8d4b0842899f Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Wed, 16 Nov 2016 14:41:18 +0000
Subject: [PATCH 1/2] Cross publishing to 2.12 [fport]

Forward port of 462ee042ad2ffeb25713b2bd27fc179148acef71.
---
 project/Util.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/Util.scala b/project/Util.scala
index 3ce6cb326..4d8419e36 100644
--- a/project/Util.scala
+++ b/project/Util.scala
@@ -14,8 +14,8 @@ object Util {
   def crossBuild: Seq[Setting[_]] =
     Seq(
       crossPaths := (scalaBinaryVersion.value match {
-        case "2.11" => true
-        case _      => false
+        case "2.10" => false
+        case _      => true
       })
     )
 

From 1fa63b64e05a01c91efc2f379948d7ed53f132c4 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Wed, 16 Nov 2016 14:42:15 +0000
Subject: [PATCH 2/2] Tweak launchconfig config [fport]

Forward port of e94147456c9d973261df1d85ead3379617d57342.
---
 project/Transform.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Transform.scala b/project/Transform.scala
index 799f4a611..521397cb1 100644
--- a/project/Transform.scala
+++ b/project/Transform.scala
@@ -27,7 +27,7 @@ object Transform {
     {
       IO.delete(conscriptBase)
       val pairs = Seq(
-        "sbt.xMain" -> "sbt",
+        "sbt.xMain" -> "xsbt",
         "sbt.ScriptMain" -> "scalas",
         "sbt.ConsoleMain" -> "screpl"
       )