Skip to content

Commit

Permalink
Merge pull request #389 from drmarjanovic/sbt-1-10-2
Browse files Browse the repository at this point in the history
sbt 1.10.2
  • Loading branch information
mcanlas authored Sep 21, 2024
2 parents 0b24c96 + c86ca4c commit d59cbd7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ sbt -v[erbosely] creating a new project built with the latest scala 2.12.x.
[addSbt] arg = '++ 2.12.20'
[residual] arg = 'about'
No extra sbt options have been defined
Detected sbt version 1.10.1
Detected sbt version 1.10.2
Using default jvm options
Detected Java version: 8
# Executing command line:
java
-Xms512m
-Xss2m
-jar
$HOME/.sbt/launchers/1.10.1/sbt-launch.jar
$HOME/.sbt/launchers/1.10.2/sbt-launch.jar
"++ 2.12.20"
about
Expand All @@ -55,7 +55,7 @@ saving stty: [..]
[info] Setting Scala version to 2.12.20 on 1 projects.
[info] Reapplying settings...
[info] Set current project to [..] (in build file:[..])
[info] This is sbt 1.10.1
[info] This is sbt 1.10.2
[info] The current project is ProjectRef(uri("file:[..]"), "[..]") [..]
[info] The current project is built against Scala 2.12.20
[info] Available Plugins
Expand Down Expand Up @@ -92,10 +92,10 @@ are not special.
-prompt <expr> Set the sbt prompt; in expr, 's' is the State and 'e' is Extracted
-script <file> Run the specified file as a scala script
# sbt version (default: sbt.version from project/build.properties if present, otherwise 1.10.1)
-sbt-version <version> use the specified version of sbt (default: 1.10.1)
-sbt-force-latest force the use of the latest release of sbt: 1.10.1
-sbt-dev use the latest pre-release version of sbt: 1.10.1
# sbt version (default: sbt.version from project/build.properties if present, otherwise 1.10.2)
-sbt-version <version> use the specified version of sbt (default: 1.10.2)
-sbt-force-latest force the use of the latest release of sbt: 1.10.2
-sbt-dev use the latest pre-release version of sbt: 1.10.2
-sbt-jar <path> use the specified jar as the sbt launcher
-sbt-launch-dir <path> directory to hold sbt launchers (default: ~/.sbt/launchers)
-sbt-launch-repo <url> repo url for downloading sbt launcher jar (default: https://repo.scala-sbt.org/scalasbt/maven-releases)
Expand Down
4 changes: 2 additions & 2 deletions sbt
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@

set -o pipefail

declare -r sbt_release_version="1.10.1"
declare -r sbt_unreleased_version="1.10.1"
declare -r sbt_release_version="1.10.2"
declare -r sbt_unreleased_version="1.10.2"

declare -r latest_213="2.13.14"
declare -r latest_212="2.12.20"
Expand Down
4 changes: 2 additions & 2 deletions test/test_helper.bash
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ export sbt_10="0.10.1"
export sbt_11="0.11.3"
export sbt_12="0.12.4"
export sbt_13="0.13.18"
export sbt_1="1.10.1"
export sbt_1="1.10.2"
export sbt_release="$sbt_1"
export sbt_dev="1.10.1"
export sbt_dev="1.10.2"

write_version_to_properties () { write_to_properties "sbt.version=$1"; }
write_to_properties () { printf "$@" > "$test_build_properties"; }
Expand Down

0 comments on commit d59cbd7

Please sign in to comment.