From 95d5aa7c4cc71dee20551075eeae8c603c5e6b22 Mon Sep 17 00:00:00 2001 From: Friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Mon, 21 Oct 2024 16:38:30 -0700 Subject: [PATCH] Bump sbt & sbt-io version --- launcher-package/build.sbt | 2 +- project/Dependencies.scala | 2 +- project/build.properties | 2 +- sbt | 4 ++-- sbt-app/src/sbt-test/project1/scripted13/test | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/launcher-package/build.sbt b/launcher-package/build.sbt index 2873a7087..252143a16 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.0", + sbtnVersion := "1.10.3", sbtnJarsBaseUrl := "https://github.com/sbt/sbtn-dist/releases/download", sbtnJarsMappings := { val baseUrl = sbtnJarsBaseUrl.value diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f4932e547..a1e21456d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -13,7 +13,7 @@ object Dependencies { sys.env.get("BUILD_VERSION") orElse sys.props.get("sbt.build.version") // sbt modules - private val ioVersion = nightlyVersion.getOrElse("1.10.0") + private val ioVersion = nightlyVersion.getOrElse("1.10.1") val zincVersion = nightlyVersion.getOrElse("2.0.0-M1") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion diff --git a/project/build.properties b/project/build.properties index 0b699c305..bc7390601 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.2 +sbt.version=1.10.3 diff --git a/sbt b/sbt index 0d4e7e4fb..11093ffc4 100755 --- a/sbt +++ b/sbt @@ -1,7 +1,7 @@ #!/usr/bin/env bash set +e -declare builtin_sbt_version="1.10.1" +declare builtin_sbt_version="1.10.3" declare -a residual_args declare -a java_args declare -a scalac_args @@ -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.0" +declare sbtn_version="1.10.3" ### ------------------------------- ### ### Helper methods for BASH scripts ### diff --git a/sbt-app/src/sbt-test/project1/scripted13/test b/sbt-app/src/sbt-test/project1/scripted13/test index 6935c0e54..9a7fad1c5 100644 --- a/sbt-app/src/sbt-test/project1/scripted13/test +++ b/sbt-app/src/sbt-test/project1/scripted13/test @@ -1,6 +1,6 @@ # This tests that this sbt scripted plugin can launch the previous one -> ^^1.10.1 +> ^^1.10.3 $ copy-file changes/A.scala src/sbt-test/a/b/A.scala > scripted