From 28a9f9c9209b9f1a3d4248ac9cbff35cbd20d861 Mon Sep 17 00:00:00 2001
From: Friendseeker <66892505+Friendseeker@users.noreply.github.com>
Date: Mon, 28 Oct 2024 11:51:02 -0700
Subject: [PATCH 01/11] Prepare for sbt 1.10.5

---
 .github/workflows/ci.yml                     | 2 +-
 build.sbt                                    | 2 +-
 project/build.properties                     | 2 +-
 sbt-app/src/sbt-test/project/scripted13/test | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 01723272da..6cb5ca5185 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,7 +55,7 @@ jobs:
       JVM_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8
       SCALA_212: 2.12.20
       UTIL_TESTS: "utilCache/test utilControl/test utilInterface/test utilLogging/test utilPosition/test utilRelation/test utilScripted/test utilTracking/test"
-      TEST_SBT_VER: 1.10.3
+      TEST_SBT_VER: 1.10.4
       SBT_ETC_FILE: $HOME/etc/sbt/sbtopts
       JDK11: adopt@1.11.0-9
       SPARK_LOCAL_IP: "127.0.0.1"
diff --git a/build.sbt b/build.sbt
index c466fbaf55..043b4880de 100644
--- a/build.sbt
+++ b/build.sbt
@@ -11,7 +11,7 @@ import scala.util.Try
 // ThisBuild settings take lower precedence,
 // but can be shared across the multi projects.
 ThisBuild / version := {
-  val v = "1.10.4-SNAPSHOT"
+  val v = "1.10.5-SNAPSHOT"
   nightlyVersion.getOrElse(v)
 }
 ThisBuild / version2_13 := "2.0.0-SNAPSHOT"
diff --git a/project/build.properties b/project/build.properties
index caeacc5eee..c0685085ed 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.3
\ No newline at end of file
+sbt.version=1.10.4
\ No newline at end of file
diff --git a/sbt-app/src/sbt-test/project/scripted13/test b/sbt-app/src/sbt-test/project/scripted13/test
index 8806b8fa8b..9a7fad1c56 100644
--- a/sbt-app/src/sbt-test/project/scripted13/test
+++ b/sbt-app/src/sbt-test/project/scripted13/test
@@ -1,6 +1,6 @@
 # This tests that this sbt scripted plugin can launch the previous one
 
-> ^^1.10.2
+> ^^1.10.3
 
 $ copy-file changes/A.scala src/sbt-test/a/b/A.scala
 > scripted

From 828dc048082da01b7aba6512de6976c90224fe25 Mon Sep 17 00:00:00 2001
From: Friendseeker <66892505+Friendseeker@users.noreply.github.com>
Date: Mon, 28 Oct 2024 18:01:54 -0700
Subject: [PATCH 02/11] Migrate all usages of `System.console == null`

---
 .../scala/sbt/internal/util/LineReader.scala     |  2 +-
 .../main/scala/sbt/internal/util/JLine3.scala    |  3 ++-
 .../main/scala/sbt/internal/util/Terminal.scala  | 16 +++++++++++++---
 .../src/main/scala/sbt/internal/ui/UITask.scala  |  3 ++-
 main/src/main/scala/sbt/Main.scala               |  4 ++--
 .../src/main/scala/sbt/TemplateCommandUtil.scala |  3 ++-
 .../main/scala/sbt/internal/InstallSbtn.scala    |  3 ++-
 7 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala
index 20db30ab02..9b8b86d4f2 100644
--- a/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala
@@ -130,7 +130,7 @@ object LineReader {
           Option(mask.map(reader.readLine(prompt, _)).getOrElse(reader.readLine(prompt)))
         } catch {
           case e: EndOfFileException =>
-            if (terminal == Terminal.console && System.console == null) None
+            if (terminal == Terminal.console && !Terminal.hasConsole) None
             else Some("exit")
           case _: IOError | _: ClosedException => Some("exit")
           case _: UserInterruptException | _: ClosedByInterruptException |
diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/JLine3.scala b/internal/util-logging/src/main/scala/sbt/internal/util/JLine3.scala
index a798b5eb06..51b2c5e408 100644
--- a/internal/util-logging/src/main/scala/sbt/internal/util/JLine3.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/JLine3.scala
@@ -20,6 +20,7 @@ import org.jline.terminal.Attributes.{ InputFlag, LocalFlag }
 import org.jline.terminal.Terminal.SignalHandler
 import org.jline.terminal.impl.{ AbstractTerminal, DumbTerminal }
 import org.jline.terminal.spi.{ SystemStream, TerminalProvider }
+import sbt.internal.util.Terminal.hasConsole
 import scala.collection.JavaConverters._
 import scala.util.Try
 import java.util.concurrent.LinkedBlockingQueue
@@ -31,7 +32,7 @@ private[sbt] object JLine3 {
     val term =
       org.jline.terminal.TerminalBuilder
         .builder()
-        .system(System.console != null)
+        .system(hasConsole)
         .paused(true)
         .build()
     initialAttributes.get match {
diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala b/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala
index 85176a9889..9a1a3c8a87 100644
--- a/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala
@@ -273,7 +273,7 @@ object Terminal {
    * the sbt client to detach from the server it launches.
    */
   def close(): Unit = {
-    if (System.console == null) {
+    if (!hasConsole) {
       originalOut.close()
       originalIn.close()
       originalErr.close()
@@ -350,7 +350,17 @@ object Terminal {
 
   private[this] val isDumb = Some("dumb") == sys.env.get("TERM")
   private[this] def isDumbTerminal = isDumb || System.getProperty("jline.terminal", "") == "none"
-  private[this] val hasConsole = Option(java.lang.System.console).isDefined
+  private[sbt] val hasConsole = {
+    System.console != null && {
+      try {
+        val isTerminal = System.console.getClass.getMethod("isTerminal")
+        isTerminal.invoke(System.console).asInstanceOf[Boolean]
+      } catch {
+        case _: NoSuchMethodException =>
+          true
+      }
+    }
+  }
   private[this] def useColorDefault: Boolean = {
     // This approximates that both stdin and stdio are connected,
     // so by default color will be turned off for pipes and redirects.
@@ -692,7 +702,7 @@ object Terminal {
                   inputStream.read match {
                     case -1 =>
                     case `NO_BOOT_CLIENTS_CONNECTED` =>
-                      if (System.console == null) {
+                      if (!Terminal.hasConsole) {
                         result.put(-1)
                         running.set(false)
                       }
diff --git a/main-command/src/main/scala/sbt/internal/ui/UITask.scala b/main-command/src/main/scala/sbt/internal/ui/UITask.scala
index e3540c570b..6e9fcd1bed 100644
--- a/main-command/src/main/scala/sbt/internal/ui/UITask.scala
+++ b/main-command/src/main/scala/sbt/internal/ui/UITask.scala
@@ -17,6 +17,7 @@ import sbt.BasicKeys.{ historyPath, colorShellPrompt }
 import sbt.State
 import sbt.internal.CommandChannel
 import sbt.internal.util.ConsoleAppender.{ ClearPromptLine, ClearScreenAfterCursor, DeleteLine }
+import sbt.internal.util.Terminal.hasConsole
 import sbt.internal.util._
 import sbt.internal.util.complete.{ Parser }
 
@@ -70,7 +71,7 @@ private[sbt] object UITask {
             if (thread.isInterrupted || closed.get) throw interrupted
             (try reader.readLine(clear + terminal.prompt.mkPrompt())
             finally reader.close) match {
-              case None if terminal == Terminal.console && System.console == null =>
+              case None if terminal == Terminal.console && !hasConsole =>
                 // No stdin is attached to the process so just ignore the result and
                 // block until the thread is interrupted.
                 this.synchronized(this.wait())
diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala
index 48d24b3e59..cae9826808 100644
--- a/main/src/main/scala/sbt/Main.scala
+++ b/main/src/main/scala/sbt/Main.scala
@@ -27,6 +27,7 @@ import sbt.internal.inc.ScalaInstance
 import sbt.internal.io.Retry
 import sbt.internal.nio.{ CheckBuildSources, FileTreeRepository }
 import sbt.internal.server.{ BuildServerProtocol, NetworkChannel }
+import sbt.internal.util.Terminal.hasConsole
 import sbt.internal.util.Types.{ const, idFun }
 import sbt.internal.util.complete.{ Parser, SizeParser }
 import sbt.internal.util.{ Terminal => ITerminal, _ }
@@ -151,8 +152,7 @@ private[sbt] object xMain {
 
     try Some(new BootServerSocket(configuration)) -> None
     catch {
-      case e: ServerAlreadyBootingException
-          if System.console != null && !ITerminal.startedByRemoteClient =>
+      case e: ServerAlreadyBootingException if hasConsole && !ITerminal.startedByRemoteClient =>
         printThrowable(e)
         println("Create a new server? y/n (default y)")
         val exit =
diff --git a/main/src/main/scala/sbt/TemplateCommandUtil.scala b/main/src/main/scala/sbt/TemplateCommandUtil.scala
index 328781dd83..71f8035189 100644
--- a/main/src/main/scala/sbt/TemplateCommandUtil.scala
+++ b/main/src/main/scala/sbt/TemplateCommandUtil.scala
@@ -22,6 +22,7 @@ import sbt.librarymanagement._
 import sbt.librarymanagement.ivy.{ IvyConfiguration, IvyDependencyResolution }
 import sbt.internal.inc.classpath.ClasspathUtil
 import BasicCommandStrings._, BasicKeys._
+import sbt.internal.util.Terminal.hasConsole
 
 private[sbt] object TemplateCommandUtil {
   def templateCommand: Command = templateCommand0(TemplateCommand)
@@ -185,7 +186,7 @@ private[sbt] object TemplateCommandUtil {
     "disneystreaming/smithy4s.g8" -> "A Smithy4s project",
   )
   private def fortifyArgs(templates: List[(String, String)]): List[String] =
-    if (System.console eq null) Nil
+    if (!hasConsole) Nil
     else
       ITerminal.withStreams(true, false) {
         assert(templates.size <= 20, "template list cannot have more than 20 items")
diff --git a/main/src/main/scala/sbt/internal/InstallSbtn.scala b/main/src/main/scala/sbt/internal/InstallSbtn.scala
index 693830f937..6315a2a6dd 100644
--- a/main/src/main/scala/sbt/internal/InstallSbtn.scala
+++ b/main/src/main/scala/sbt/internal/InstallSbtn.scala
@@ -11,6 +11,7 @@ package internal
 
 import Def._
 import Keys.{ sbtVersion, state, terminal }
+import sbt.internal.util.Terminal.hasConsole
 
 import java.io.{ File, FileInputStream, FileOutputStream, InputStream, IOException }
 import java.net.URI
@@ -37,7 +38,7 @@ private[sbt] object InstallSbtn {
       Files.deleteIfExists(tmp)
       ()
     }
-    val shell = if (System.console != null) getShell(term) else "none"
+    val shell = if (hasConsole) getShell(term) else "none"
     shell match {
       case "none" =>
       case s =>

From 92d4cfa69005eefed675d89193673f4b410cd5b7 Mon Sep 17 00:00:00 2001
From: Friendseeker <66892505+Friendseeker@users.noreply.github.com>
Date: Tue, 29 Oct 2024 17:43:33 -0700
Subject: [PATCH 03/11] Replace nnbsp with regular space

---
 .../src/main/scala/sbt/internal/client/NetworkClient.scala      | 2 +-
 main/src/main/scala/sbt/internal/Aggregation.scala              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
index e31891564a..505d1a1c92 100644
--- a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
+++ b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
@@ -1011,7 +1011,7 @@ class NetworkClient(
   private def timing(startTime: Long, endTime: Long): String = {
     import java.text.DateFormat
     val format = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM)
-    val nowString = format.format(new java.util.Date(endTime))
+    val nowString = format.format(new java.util.Date(endTime)).replace("\u202F", "\u0020")
     val total = math.max(0, (endTime - startTime + 500) / 1000)
     val totalString = s"$total s" +
       (if (total <= 60) ""
diff --git a/main/src/main/scala/sbt/internal/Aggregation.scala b/main/src/main/scala/sbt/internal/Aggregation.scala
index 8a26dcd77e..767d0acc8b 100644
--- a/main/src/main/scala/sbt/internal/Aggregation.scala
+++ b/main/src/main/scala/sbt/internal/Aggregation.scala
@@ -152,7 +152,7 @@ object Aggregation {
   }
 
   def timing(format: java.text.DateFormat, startTime: Long, endTime: Long): String = {
-    val nowString = format.format(new java.util.Date(endTime))
+    val nowString = format.format(new java.util.Date(endTime)).replace("\u202F", "\u0020")
     val total = (endTime - startTime + 500) / 1000
     val totalString = s"$total s" +
       (if (total <= 60) ""

From fae2bcc01b3f8a1afeea1a6240d7f721cde17193 Mon Sep 17 00:00:00 2001
From: friendseeker <66892505+Friendseeker@users.noreply.github.com>
Date: Tue, 29 Oct 2024 21:40:51 -0700
Subject: [PATCH 04/11] Add documentation & deduplicate implementation

---
 .../sbt/internal/client/NetworkClient.scala   | 50 +++++++++++--------
 .../main/scala/sbt/internal/Aggregation.scala | 16 +-----
 .../scala/sbt/internal/AggregationSpec.scala  |  4 ++
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
index 505d1a1c92..45ec9b52c7 100644
--- a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
+++ b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
@@ -15,8 +15,10 @@ import java.lang.ProcessBuilder.Redirect
 import java.net.{ Socket, SocketException }
 import java.nio.file.Files
 import java.util.UUID
+import java.util.Date
 import java.util.concurrent.atomic.{ AtomicBoolean, AtomicReference }
 import java.util.concurrent.{ ConcurrentHashMap, LinkedBlockingQueue, TimeUnit }
+import java.text.DateFormat
 
 import sbt.BasicCommandStrings.{ DashDashDetachStdio, DashDashServer, Shutdown, TerminateAction }
 import sbt.internal.client.NetworkClient.Arguments
@@ -532,7 +534,7 @@ class NetworkClient(
       case null =>
       case (q, startTime, name) =>
         val now = System.currentTimeMillis
-        val message = timing(startTime, now)
+        val message = NetworkClient.timing(startTime, now)
         val ec = exitCode
         if (batchMode.get || !attached.get) {
           if (ec == 0) console.success(message)
@@ -1006,26 +1008,6 @@ class NetworkClient(
       RawInputThread.this.interrupt()
     }
   }
-
-  // copied from Aggregation
-  private def timing(startTime: Long, endTime: Long): String = {
-    import java.text.DateFormat
-    val format = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM)
-    val nowString = format.format(new java.util.Date(endTime)).replace("\u202F", "\u0020")
-    val total = math.max(0, (endTime - startTime + 500) / 1000)
-    val totalString = s"$total s" +
-      (if (total <= 60) ""
-       else {
-         val maybeHours = total / 3600 match {
-           case 0 => ""
-           case h => f"$h%02d:"
-         }
-         val mins = f"${total % 3600 / 60}%02d"
-         val secs = f"${total % 60}%02d"
-         s" ($maybeHours$mins:$secs)"
-       })
-    s"Total time: $totalString, completed $nowString"
-  }
 }
 
 object NetworkClient {
@@ -1138,6 +1120,32 @@ object NetworkClient {
     )
   }
 
+  private[sbt] def timing(format: DateFormat, startTime: Long, endTime: Long): String = {
+    // sbt#7558
+    // JDK 20+ emits special space (NNBSP) as part of formatted date
+    // Which sometimes becomes garbled in standard output
+    // Therefore we replace NNBSP (u202f) with standard space (u0020)
+    val nowString = format.format(new Date(endTime)).replace("\u202F", "\u0020")
+    val total = (endTime - startTime + 500) / 1000
+    val totalString = s"$total s" +
+      (if (total <= 60) ""
+       else {
+         val maybeHours = total / 3600 match {
+           case 0 => ""
+           case h => f"$h%02d:"
+         }
+         val mins = f"${total % 3600 / 60}%02d"
+         val secs = f"${total % 60}%02d"
+         s" ($maybeHours$mins:$secs)"
+       })
+    s"Total time: $totalString, completed $nowString"
+  }
+
+  private[sbt] def timing(startTime: Long, endTime: Long): String = {
+    val format = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM)
+    timing(format, startTime, endTime)
+  }
+
   def client(
       baseDirectory: File,
       args: Array[String],
diff --git a/main/src/main/scala/sbt/internal/Aggregation.scala b/main/src/main/scala/sbt/internal/Aggregation.scala
index 767d0acc8b..311e1beb1d 100644
--- a/main/src/main/scala/sbt/internal/Aggregation.scala
+++ b/main/src/main/scala/sbt/internal/Aggregation.scala
@@ -17,6 +17,7 @@ import sbt.SlashSyntax0._
 import sbt.internal.util.complete.Parser
 import sbt.internal.util.complete.Parser.{ failure, seq, success }
 import sbt.internal.util._
+import sbt.internal.client.NetworkClient
 import sbt.std.Transform.DummyTaskMap
 import sbt.util.{ Logger, Show }
 import scala.annotation.nowarn
@@ -152,20 +153,7 @@ object Aggregation {
   }
 
   def timing(format: java.text.DateFormat, startTime: Long, endTime: Long): String = {
-    val nowString = format.format(new java.util.Date(endTime)).replace("\u202F", "\u0020")
-    val total = (endTime - startTime + 500) / 1000
-    val totalString = s"$total s" +
-      (if (total <= 60) ""
-       else {
-         val maybeHours = total / 3600 match {
-           case 0 => ""
-           case h => f"$h%02d:"
-         }
-         val mins = f"${total % 3600 / 60}%02d"
-         val secs = f"${total % 60}%02d"
-         s" ($maybeHours$mins:$secs)"
-       })
-    s"Total time: $totalString, completed $nowString"
+    NetworkClient.timing(format, startTime, endTime)
   }
 
   def defaultFormat: DateFormat = {
diff --git a/main/src/test/scala/sbt/internal/AggregationSpec.scala b/main/src/test/scala/sbt/internal/AggregationSpec.scala
index 9acf09dc39..8ac2d8f8a4 100644
--- a/main/src/test/scala/sbt/internal/AggregationSpec.scala
+++ b/main/src/test/scala/sbt/internal/AggregationSpec.scala
@@ -22,4 +22,8 @@ object AggregationSpec extends verify.BasicTestSuite {
     assert(timing(6003099).startsWith("Total time: 6003 s (01:40:03),"))
     assert(timing(96003099).startsWith("Total time: 96003 s (26:40:03),"))
   }
+
+  test("timing should not emit special space characters") {
+    assert(!timing(96003099).contains("\u202F"))
+  }
 }

From 0368243ed9db9237e7397ea23ec008e0b25086ac Mon Sep 17 00:00:00 2001
From: Friendseeker <66892505+Friendseeker@users.noreply.github.com>
Date: Thu, 31 Oct 2024 15:05:48 -0700
Subject: [PATCH 05/11] Return 1 when Client failed

---
 client/src/main/java/sbt/client/Client.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/src/main/java/sbt/client/Client.java b/client/src/main/java/sbt/client/Client.java
index 6ffe838ffe..dcabbf158a 100644
--- a/client/src/main/java/sbt/client/Client.java
+++ b/client/src/main/java/sbt/client/Client.java
@@ -9,19 +9,21 @@
 package sbt.client;
 
 import sbt.internal.client.NetworkClient;
-import java.nio.file.Paths;
 import org.fusesource.jansi.AnsiConsole;
 
 public class Client {
   public static void main(final String[] args) {
     boolean isWin = System.getProperty("os.name").toLowerCase().startsWith("win");
+    boolean hadError = false;
     try {
       if (isWin) AnsiConsole.systemInstall();
       NetworkClient.main(args);
     } catch (final Throwable t) {
       t.printStackTrace();
+      hadError = true;
     } finally {
       if (isWin) AnsiConsole.systemUninstall();
+      if (hadError) System.exit(1);
     }
   }
 }

From c58842da4e8e143fc9c9d355054536e7f21f8145 Mon Sep 17 00:00:00 2001
From: friendseeker <66892505+Friendseeker@users.noreply.github.com>
Date: Thu, 31 Oct 2024 19:37:16 -0700
Subject: [PATCH 06/11] Add smoke test

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6cb5ca5185..617efd46d4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -167,6 +167,8 @@ jobs:
       run: |
         # test building sbtn on Linux
         sbt "-Dsbt.io.virtual=false" nativeImage
+        # smoke test native Image
+        ./client/target/bin/sbtn shutdown
         # test launcher script
         echo build using JDK 8 test using JDK 8 and JDK 11
         cd launcher-package

From 801137de3190e997dbd1eaff1ae2418e2703a7e7 Mon Sep 17 00:00:00 2001
From: friendseeker <66892505+Friendseeker@users.noreply.github.com>
Date: Thu, 31 Oct 2024 20:43:10 -0700
Subject: [PATCH 07/11] Revert "Merge pull request #7823 from
 Friendseeker/musl"

This reverts commit 0c00dbaf4bd1b1fa6075bfefd99947b454785b00, reversing
changes made to 91ea2feb64eec747c03b7c6000b17bede71339fc.
---
 .github/workflows/ci.yml |  7 -------
 build.sbt                | 11 +++--------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6cb5ca5185..6387d37791 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -80,13 +80,6 @@ jobs:
         repository: sbt/zinc
         ref: 1.10.x
         path: zinc
-    - uses: graalvm/setup-graalvm@v1
-      if: ${{ matrix.jobtype >= 7 && matrix.jobtype <= 9 }}
-      with:
-        java-version: '23'
-        native-image-musl: 'true'
-        set-java-home: 'false'
-        github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Setup JDK
       uses: actions/setup-java@v4
       with:
diff --git a/build.sbt b/build.sbt
index 043b4880de..eff81a5c84 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1176,13 +1176,8 @@ lazy val sbtClientProj = (project in file("client"))
     nativeImageReady := { () =>
       ()
     },
-    if (isArmArchitecture)
-      Seq(
-        nativeImageVersion := "23.0",
-        nativeImageJvm := "graalvm-java23",
-      )
-    else Nil,
-    nativeImageInstalled := !isArmArchitecture,
+    nativeImageVersion := "23.0",
+    nativeImageJvm := "graalvm-java23",
     nativeImageOutput := {
       val outputDir = (target.value / "bin").toPath
       if (!Files.exists(outputDir)) {
@@ -1204,7 +1199,7 @@ lazy val sbtClientProj = (project in file("client"))
       s"-H:Name=${target.value / "bin" / "sbtn"}",
     ) ++ (if (isLinux && isArmArchitecture)
             Seq("-H:PageSize=65536") // Make sure binary runs on kernels with page size set to 4k, 16 and 64k
-          else Nil) ++ (if (isLinux && !isArmArchitecture) Seq("--static", "--libc=musl") else Nil),
+          else Nil),
     buildThinClient := {
       val isFish = Def.spaceDelimited("").parsed.headOption.fold(false)(_ == "--fish")
       val ext = if (isWin) ".bat" else if (isFish) ".fish" else ".sh"

From 8ab2a23f1141b9d6c26ecbc791f3c7b76da2a8ea Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sun, 3 Nov 2024 03:33:25 -0500
Subject: [PATCH 08/11] sbtn 1.10.5

---
 launcher-package/build.sbt | 2 +-
 sbt                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/launcher-package/build.sbt b/launcher-package/build.sbt
index 44b1d03bca..6ef8c07582 100755
--- a/launcher-package/build.sbt
+++ b/launcher-package/build.sbt
@@ -121,7 +121,7 @@ val root = (project in file(".")).
       file
     },
     // update sbt.sh at root
-    sbtnVersion := "1.10.4",
+    sbtnVersion := "1.10.5",
     sbtnJarsBaseUrl := "https://github.com/sbt/sbtn-dist/releases/download",
     sbtnJarsMappings := {
       val baseUrl = sbtnJarsBaseUrl.value
diff --git a/sbt b/sbt
index 0fb251e790..0b41018d88 100755
--- a/sbt
+++ b/sbt
@@ -24,7 +24,7 @@ declare build_props_sbt_version=
 declare use_sbtn=
 declare no_server=
 declare sbtn_command="$SBTN_CMD"
-declare sbtn_version="1.10.4"
+declare sbtn_version="1.10.5"
 
 ###  ------------------------------- ###
 ###  Helper methods for BASH scripts ###

From 126846f88c7a8e7ae962ba6edcb915a93906dc6f Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sun, 3 Nov 2024 12:25:03 -0500
Subject: [PATCH 09/11] lm-coursier 2.1.5, Coursier 2.1.14

---
 project/Dependencies.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index a50c763576..7200e3e43c 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -77,7 +77,7 @@ object Dependencies {
   def addSbtZincCompile = addSbtModule(sbtZincPath, "zincCompile", zincCompile)
   def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCore", zincCompileCore)
 
-  val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.1.4"
+  val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.1.5"
 
   def sjsonNew(n: String) =
     Def.setting("com.eed3si9n" %% n % "0.10.1") // contrabandSjsonNewVersion.value

From f8280f14c894e4f981427249ec6220168a7b70f9 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sun, 3 Nov 2024 14:42:10 -0500
Subject: [PATCH 10/11] Fix ++ with a command argument

**Problem**
sbt 1.10.0 added support for ++ command with external reference,
but broke ++ takes an aggregate command with slash.

**Solution**
This fixes the parser
---
 main/src/main/scala/sbt/Cross.scala                  | 5 ++++-
 sbt-app/src/sbt-test/actions/cross-multiproject/test | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/main/src/main/scala/sbt/Cross.scala b/main/src/main/scala/sbt/Cross.scala
index 6dc8dffd39..5fb67a6677 100644
--- a/main/src/main/scala/sbt/Cross.scala
+++ b/main/src/main/scala/sbt/Cross.scala
@@ -122,7 +122,10 @@ object Cross {
       .map { case uri ~ seg1 ~ cmd => (uri, seg1, cmd) }
     Parser.parse(command, parser) match {
       case Right((uri, seg1, cmd)) =>
-        structure.allProjectRefs.find(p => uri.contains(p.build.toString) && seg1 == p.project) match {
+        structure.allProjectRefs.find {
+          case p if uri.isDefined => seg1 == p.project && uri.contains(p.build.toString)
+          case p                  => seg1 == p.project
+        } match {
           case Some(proj) => (Seq(proj), cmd)
           case _          => (resolveAggregates(extracted), command)
         }
diff --git a/sbt-app/src/sbt-test/actions/cross-multiproject/test b/sbt-app/src/sbt-test/actions/cross-multiproject/test
index bef1a492ff..03a96cb834 100644
--- a/sbt-app/src/sbt-test/actions/cross-multiproject/test
+++ b/sbt-app/src/sbt-test/actions/cross-multiproject/test
@@ -21,6 +21,12 @@ $ exists sbt-foo/target/scala-2.12
 $ exists ref/target/scala-2.12
 -$ exists ref/target/scala-2.13
 
+# test safe switching
+> clean
+> ++ 2.12.20 -v libProj/compile
+$ exists lib/target/scala-2.12
+-$ exists lib/target/scala-2.13
+
 # Test legacy cross build with command support
 # > clean
 # > + build

From 82d834a676f5f50fa49059cb352c2e31f0f0dcd9 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sun, 3 Nov 2024 18:10:43 -0500
Subject: [PATCH 11/11] sbt 1.10.5

---
 project/build.properties | 2 +-
 sbt                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index c0685085ed..c7450fc2a9 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.4
\ No newline at end of file
+sbt.version=1.10.5
\ No newline at end of file
diff --git a/sbt b/sbt
index 0b41018d88..2b4359ba38 100755
--- a/sbt
+++ b/sbt
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 set +e
-declare builtin_sbt_version="1.10.4"
+declare builtin_sbt_version="1.10.5"
 declare -a residual_args
 declare -a java_args
 declare -a scalac_args