Skip to content

Commit 489d42f

Browse files
authored
Update Cargo.lock (#6)
* Update Cargo.lock * update sbt * update sbt-decent-scala
1 parent 1080510 commit 489d42f

File tree

3 files changed

+26
-23
lines changed

3 files changed

+26
-23
lines changed

native/Cargo.lock

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
addSbtPlugin("com.github.sbt" % "sbt-jni" % "1.5.3")
22
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
3-
addSbtPlugin("com.github.sideeffffect" % "sbt-decent-scala" % "0.7.0+21-3da3109c")
3+
addSbtPlugin("com.github.sideeffffect" % "sbt-decent-scala" % "0.7.0+67-8237dd32")

sbt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434

3535
set -o pipefail
3636

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"
3939

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"
4242
declare -r latest_211="2.11.12"
4343
declare -r latest_210="2.10.7"
4444
declare -r latest_29="2.9.3"
@@ -216,7 +216,8 @@ getJavaVersion() {
216216
# but on 9 and 10 it's 9.x.y and 10.x.y.
217217
if [[ "$str" =~ ^1\.([0-9]+)(\..*)?$ ]]; then
218218
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
220221
echo "${BASH_REMATCH[1]}"
221222
elif [[ -n "$str" ]]; then
222223
echoerr "Can't parse java version from: $str"
@@ -252,7 +253,9 @@ is_apple_silicon() { [[ "$(uname -s)" == "Darwin" && "$(uname -m)" == "arm64" ]]
252253
# MaxPermSize critical on pre-8 JVMs but incurs noisy warning on 8+
253254
default_jvm_opts() {
254255
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
256259
if is_apple_silicon; then
257260
# As of Dec 2020, JVM for Apple Silicon (M1) doesn't support JVMCI
258261
echo "$default_jvm_opts_common"

0 commit comments

Comments
 (0)