From 9ffae4e31fd0cd8c992482931db64e1ef2c9c371 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 14 Sep 2018 00:38:24 -0400
Subject: [PATCH 1/3] Allow single-letter aliases

Fixes #1074
---
 main/src/main/scala/sbt/Cross.scala          | 2 +-
 sbt/src/sbt-test/actions/add-alias/build.sbt | 1 +
 sbt/src/sbt-test/actions/add-alias/test      | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/main/src/main/scala/sbt/Cross.scala b/main/src/main/scala/sbt/Cross.scala
index 650e213f7..c98b790d7 100644
--- a/main/src/main/scala/sbt/Cross.scala
+++ b/main/src/main/scala/sbt/Cross.scala
@@ -69,7 +69,7 @@ object Cross {
     token(CrossCommand <~ OptSpace) flatMap { _ =>
       (token(Parser.opt("-v" <~ Space)) ~ token(matched(state.combinedParser))).map {
         case (verbose, command) => CrossArgs(command, verbose.isDefined)
-      } & spacedFirst(CrossCommand)
+      }
     }
 
   private def crossRestoreSessionParser: Parser[String] = token(CrossRestoreSessionCommand)
diff --git a/sbt/src/sbt-test/actions/add-alias/build.sbt b/sbt/src/sbt-test/actions/add-alias/build.sbt
index cb5461c6b..089e388c1 100644
--- a/sbt/src/sbt-test/actions/add-alias/build.sbt
+++ b/sbt/src/sbt-test/actions/add-alias/build.sbt
@@ -1,2 +1,3 @@
 addCommandAlias("demo-success", "run true")
 addCommandAlias("demo-failure", "run false")
+addCommandAlias("z", "scalaVersion")
diff --git a/sbt/src/sbt-test/actions/add-alias/test b/sbt/src/sbt-test/actions/add-alias/test
index b82ec3f27..307aaccf7 100644
--- a/sbt/src/sbt-test/actions/add-alias/test
+++ b/sbt/src/sbt-test/actions/add-alias/test
@@ -1,2 +1,3 @@
 > demo-success
 -> demo-failure
+> +z

From a2ef775edcda9a305b414ff6599aa126c4a08366 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sun, 16 Sep 2018 01:51:53 -0400
Subject: [PATCH 2/3] Add scaladoc for Cross

---
 main/src/main/scala/sbt/Cross.scala | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main/src/main/scala/sbt/Cross.scala b/main/src/main/scala/sbt/Cross.scala
index c98b790d7..d38bc9796 100644
--- a/main/src/main/scala/sbt/Cross.scala
+++ b/main/src/main/scala/sbt/Cross.scala
@@ -20,6 +20,10 @@ import sbt.internal.util.complete.{ DefaultParsers, Parser }
 import sbt.io.IO
 import sbt.librarymanagement.CrossVersion
 
+/**
+ * Cross implements the Scala cross building commands:
+ * + ("cross") command and ++ ("switch") command.
+ */
 object Cross {
 
   private[sbt] def spacedFirst(name: String) = opOrIDSpaced(name) ~ any.+

From d1cdebfebf8bc69c5e44b7d0c1e1c00e64d9ed8a Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sun, 16 Sep 2018 01:52:06 -0400
Subject: [PATCH 3/3] Add test for just z

---
 sbt/src/sbt-test/actions/add-alias/test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sbt/src/sbt-test/actions/add-alias/test b/sbt/src/sbt-test/actions/add-alias/test
index 307aaccf7..0269ab4f8 100644
--- a/sbt/src/sbt-test/actions/add-alias/test
+++ b/sbt/src/sbt-test/actions/add-alias/test
@@ -1,3 +1,4 @@
 > demo-success
 -> demo-failure
 > +z
+> z