Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Upgrade to sbt 0.13.13 (#171)
  • Loading branch information
dwijnand committed Oct 28, 2016
1 parent ab365a8 commit 3237ff3
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 22 deletions.
20 changes: 8 additions & 12 deletions README.md
Expand Up @@ -28,25 +28,21 @@ sbt -v[erbosely] creating a new project built with the latest scala 2.10.x.
[addSbt] arg = '++ 2.10.6'
[residual] arg = 'about'
No extra sbt options have been defined
Detected sbt version 0.13.12
Detected sbt version 0.13.13
Using default jvm options
Detected Java version: 1.8.0_72
Detected Java version: 1.8.0_102
# Executing command line:
java
-Xms512m
-Xmx1536m
-Xss2m
-XX:ReservedCodeCacheSize=256m
-XX:+TieredCompilation
-XX:+CMSClassUnloadingEnabled
-XX:+UseConcMarkSweepGC
-jar
$HOME/.sbt/launchers/0.13.12/sbt-launch.jar
$HOME/.sbt/launchers/0.13.13/sbt-launch.jar
"++ 2.10.6"
about
[info] Setting version to 2.10.6
[info] This is sbt 0.13.12
[info] This is sbt 0.13.13
[info] The current project is built against Scala 2.10.6
[info] sbt, sbt plugins, and build definitions are using Scala 2.10.6
```
Expand Down Expand Up @@ -84,10 +80,10 @@ runner with the -x option.
-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 0.13.12)
-sbt-force-latest force the use of the latest release of sbt: 0.13.12
-sbt-version <version> use the specified version of sbt (default: 0.13.12)
-sbt-dev use the latest pre-release version of sbt: 0.13.13-RC3
# sbt version (default: sbt.version from project/build.properties if present, otherwise 0.13.13)
-sbt-force-latest force the use of the latest release of sbt: 0.13.13
-sbt-version <version> use the specified version of sbt (default: 0.13.13)
-sbt-dev use the latest pre-release version of sbt: 0.13.13
-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: http://repo.typesafe.com/typesafe/ivy-releases)
Expand Down
8 changes: 3 additions & 5 deletions sbt
Expand Up @@ -5,8 +5,8 @@

set -o pipefail

declare -r sbt_release_version="0.13.12"
declare -r sbt_unreleased_version="0.13.13-RC3"
declare -r sbt_release_version="0.13.13"
declare -r sbt_unreleased_version="0.13.13"

declare -r latest_212="2.12.0-RC1"
declare -r latest_211="2.11.8"
Expand Down Expand Up @@ -399,9 +399,7 @@ process_args () {
-210) setScalaVersion "$latest_210" && shift ;;
-211) setScalaVersion "$latest_211" && shift ;;
-212) setScalaVersion "$latest_212" && shift ;;

# TODO: Switch the below to sbt_release_version after 0.13.13 (and "new") is out
new) sbt_new=true && sbt_explicit_version="$sbt_unreleased_version" && addResidual "$1" && shift ;;
new) sbt_new=true && sbt_explicit_version="$sbt_release_version" && addResidual "$1" && shift ;;
*) addResidual "$1" && shift ;;
esac
done
Expand Down
2 changes: 1 addition & 1 deletion test/config-file.bats
Expand Up @@ -20,7 +20,7 @@ expectedOutput () { cat <<EOM
-Xss4m
-Xms1g
-jar
$TEST_ROOT/.sbt/launchers/0.13.12/sbt-launch.jar
$TEST_ROOT/.sbt/launchers/0.13.13/sbt-launch.jar
about
EOM
}
Expand Down
4 changes: 2 additions & 2 deletions test/download.bats
Expand Up @@ -102,11 +102,11 @@ EOS
}

@test "supports unix line endings (lf) in build.properties" {
write_to_properties_and_fetch "sbt.version=0.13.12\n" "0.13.12"
write_to_properties_and_fetch "sbt.version=0.13.13\n" "0.13.13"
}

@test "skips any irrelevant lines in build.properties" {
write_to_properties_and_fetch "# hand written:\n\nsbt.version=0.13.12\nsbt.something = else\n" "0.13.12"
write_to_properties_and_fetch "# hand written:\n\nsbt.version=0.13.13\nsbt.something = else\n" "0.13.13"
}

@test "skips to download sbt-launch.jar if a file was given via -sbt-jar" {
Expand Down
4 changes: 2 additions & 2 deletions test/test_helper.bash
Expand Up @@ -11,9 +11,9 @@ export sbt_07="0.7.7"
export sbt_10="0.10.1"
export sbt_11="0.11.3"
export sbt_12="0.12.4"
export sbt_13="0.13.12"
export sbt_13="0.13.13"
export sbt_release="$sbt_13"
export sbt_dev="0.13.13-RC3"
export sbt_dev="0.13.13"

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

0 comments on commit 3237ff3

Please sign in to comment.