From a0f5c83e796129a7b715306cc650f3b374824801 Mon Sep 17 00:00:00 2001
From: Angel98518 <daniel98518@gmail.com>
Date: Thu, 8 Jan 2026 20:51:27 +0100
Subject: [PATCH 1/2] Fix --sbt-version to expand to -Dsbt.version

Fixes #6645

The --sbt-version flag was incorrectly trying to download an sbt launcher
with the specified version, which doesn't exist for many sbt versions.

Changes:
- Modified --sbt-version handling to directly add -Dsbt.version property
- Removed sbt_version variable assignment that caused launcher mismatch
- acquire_sbt_jar now uses default launcher version instead

Now --sbt-version X.Y.Z correctly expands to -Dsbt.version=X.Y.Z without
affecting the sbt launcher version used to run the build.
---
 sbt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sbt b/sbt
index 729a5b34b..8bf51783a 100755
--- a/sbt
+++ b/sbt
@@ -550,7 +550,7 @@ run() {
   syncPreloaded
 
   # no jar? download it.
-  [[ -f "$sbt_jar" ]] || acquire_sbt_jar "$sbt_version" || {
+  [[ -f "$sbt_jar" ]] || acquire_sbt_jar || {
     exit 1
   }
 
@@ -746,7 +746,7 @@ process_args () {
                              sbt_cache="$2" &&
                              addJava "-Dsbt.global.localcache=$2" &&
                              shift 2 ;;
- -sbt-version|--sbt-version) require_arg version "$1" "$2" && sbt_version="$2" && shift 2 ;;
+ -sbt-version|--sbt-version) require_arg version "$1" "$2" && addJava "-Dsbt.version=$2" && shift 2 ;;
      -java-home|--java-home) require_arg path "$1" "$2" &&
                              java_cmd="$2/bin/java" &&
                              export JAVA_HOME="$2" &&