|
34 | 34 |
|
35 | 35 | set -o pipefail
|
36 | 36 |
|
37 |
| -declare -r sbt_release_version="1.4.7" |
38 |
| -declare -r sbt_unreleased_version="1.5.0-M2" |
| 37 | +declare -r sbt_release_version="1.5.8" |
| 38 | +declare -r sbt_unreleased_version="1.6.0-M1" |
39 | 39 |
|
40 |
| -declare -r latest_213="2.13.5" |
41 |
| -declare -r latest_212="2.12.12" |
| 40 | +declare -r latest_213="2.13.7" |
| 41 | +declare -r latest_212="2.12.15" |
42 | 42 | declare -r latest_211="2.11.12"
|
43 | 43 | declare -r latest_210="2.10.7"
|
44 | 44 | declare -r latest_29="2.9.3"
|
@@ -216,7 +216,8 @@ getJavaVersion() {
|
216 | 216 | # but on 9 and 10 it's 9.x.y and 10.x.y.
|
217 | 217 | if [[ "$str" =~ ^1\.([0-9]+)(\..*)?$ ]]; then
|
218 | 218 | echo "${BASH_REMATCH[1]}"
|
219 |
| - elif [[ "$str" =~ ^([0-9]+)(\..*)?$ ]]; then |
| 219 | + # Fixes https://github.com/dwijnand/sbt-extras/issues/326 |
| 220 | + elif [[ "$str" =~ ^([0-9]+)(\..*)?(-ea)?$ ]]; then |
220 | 221 | echo "${BASH_REMATCH[1]}"
|
221 | 222 | elif [[ -n "$str" ]]; then
|
222 | 223 | echoerr "Can't parse java version from: $str"
|
@@ -252,7 +253,9 @@ is_apple_silicon() { [[ "$(uname -s)" == "Darwin" && "$(uname -m)" == "arm64" ]]
|
252 | 253 | # MaxPermSize critical on pre-8 JVMs but incurs noisy warning on 8+
|
253 | 254 | default_jvm_opts() {
|
254 | 255 | local -r v="$(java_version)"
|
255 |
| - if [[ $v -ge 10 ]]; then |
| 256 | + if [[ $v -ge 17 ]]; then |
| 257 | + echo "$default_jvm_opts_common" |
| 258 | + elif [[ $v -ge 10 ]]; then |
256 | 259 | if is_apple_silicon; then
|
257 | 260 | # As of Dec 2020, JVM for Apple Silicon (M1) doesn't support JVMCI
|
258 | 261 | echo "$default_jvm_opts_common"
|
|
0 commit comments