From 2efde31ac648531104e5f3c603335c8da94de392 Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Thu, 20 Oct 2022 14:13:55 -0700 Subject: [PATCH] Update sbt script (#260) --- sbt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sbt b/sbt index e45f65ff..d0499c51 100755 --- a/sbt +++ b/sbt @@ -34,11 +34,11 @@ set -o pipefail -declare -r sbt_release_version="1.4.8" -declare -r sbt_unreleased_version="1.5.0-M2" +declare -r sbt_release_version="1.7.2" +declare -r sbt_unreleased_version="1.7.2" -declare -r latest_213="2.13.5" -declare -r latest_212="2.12.12" +declare -r latest_213="2.13.10" +declare -r latest_212="2.12.17" declare -r latest_211="2.11.12" declare -r latest_210="2.10.7" declare -r latest_29="2.9.3" @@ -216,7 +216,8 @@ getJavaVersion() { # but on 9 and 10 it's 9.x.y and 10.x.y. if [[ "$str" =~ ^1\.([0-9]+)(\..*)?$ ]]; then echo "${BASH_REMATCH[1]}" - elif [[ "$str" =~ ^([0-9]+)(\..*)?$ ]]; then + # Fixes https://github.com/dwijnand/sbt-extras/issues/326 + elif [[ "$str" =~ ^([0-9]+)(\..*)?(-ea)?$ ]]; then echo "${BASH_REMATCH[1]}" elif [[ -n "$str" ]]; then echoerr "Can't parse java version from: $str" @@ -252,7 +253,9 @@ is_apple_silicon() { [[ "$(uname -s)" == "Darwin" && "$(uname -m)" == "arm64" ]] # MaxPermSize critical on pre-8 JVMs but incurs noisy warning on 8+ default_jvm_opts() { local -r v="$(java_version)" - if [[ $v -ge 10 ]]; then + if [[ $v -ge 17 ]]; then + echo "$default_jvm_opts_common" + elif [[ $v -ge 10 ]]; then if is_apple_silicon; then # As of Dec 2020, JVM for Apple Silicon (M1) doesn't support JVMCI echo "$default_jvm_opts_common"