From 6bc784a195fbe22f7db4c37ebee1bca5f0904a73 Mon Sep 17 00:00:00 2001
From: Ethan Atkins <contact@ethanatkins.com>
Date: Sat, 15 Aug 2020 09:35:25 -0700
Subject: [PATCH 1/2] Change remaining sbtc to sbtn

---
 client/completions/_sbtn     | 2 +-
 client/completions/sbtn.bash | 2 +-
 client/completions/sbtn.fish | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/completions/_sbtn b/client/completions/_sbtn
index ccaab5460..c388ee092 100755
--- a/client/completions/_sbtn
+++ b/client/completions/_sbtn
@@ -1,5 +1,5 @@
 #compdef sbtn
 
 COMPLETE="--completions=${words[@]}"
-COMPLETIONS=($(sbtc --no-tab ${COMPLETE}))
+COMPLETIONS=($(sbtn --no-tab ${COMPLETE}))
 _alternative 'arguments:custom arg:($COMPLETIONS)'
diff --git a/client/completions/sbtn.bash b/client/completions/sbtn.bash
index bb501f1d1..6fcb9fff1 100644
--- a/client/completions/sbtn.bash
+++ b/client/completions/sbtn.bash
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 _do_sbtn_completions() {
-  COMPREPLY=($(sbtc "--completions=${COMP_LINE}"))
+  COMPREPLY=($(sbtn "--completions=${COMP_LINE}"))
 }
 
 complete -F _do_sbtn_completions sbtn
diff --git a/client/completions/sbtn.fish b/client/completions/sbtn.fish
index 45e2e5e15..e5a2d7a02 100755
--- a/client/completions/sbtn.fish
+++ b/client/completions/sbtn.fish
@@ -1,4 +1,4 @@
 function __sbtcomp
-  sbtc --completions="$argv"
+  sbtn --completions="$argv"
 end
 complete --command sbtn -f --arguments '(__sbtcomp (commandline -cp))'

From c480ffb3e4e29efcde830de1c1dbcd16dd36b5a5 Mon Sep 17 00:00:00 2001
From: Ethan Atkins <contact@ethanatkins.com>
Date: Sat, 15 Aug 2020 09:38:41 -0700
Subject: [PATCH 2/2] Build the thin client with scala 2.12.11

With scala 2.12.12, building the thin client fails aggressively. See
https://github.com/sbt/sbt/issues/5756.
---
 build.sbt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.sbt b/build.sbt
index 270d6376f..b66d8d227 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1100,6 +1100,7 @@ lazy val sbtClientProj = (project in file("client"))
   .dependsOn(commandProj)
   .settings(
     commonBaseSettings,
+    scalaVersion := "2.12.11", // The thin client does not build with 2.12.12
     publish / skip := true,
     name := "sbt-client",
     mimaPreviousArtifacts := Set.empty,