From 7a6959ae57d8d77afae0d13f9f156668ad358343 Mon Sep 17 00:00:00 2001 From: HyukjinKwon Date: Tue, 6 Apr 2021 20:13:47 +0900 Subject: [PATCH 1/2] Remove .sbtopts that duplicately sets the default memory --- .sbtopts | 17 ----------------- build/sbt | 1 + 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 .sbtopts diff --git a/.sbtopts b/.sbtopts deleted file mode 100644 index 9afbdca6db1c7..0000000000000 --- a/.sbtopts +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - --J-Xmx4G --J-Xss4m diff --git a/build/sbt b/build/sbt index 475dfd3b20b43..ae9ca93fc9ca9 100755 --- a/build/sbt +++ b/build/sbt @@ -53,6 +53,7 @@ realpath () { declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy" declare -r sbt_opts_file=".sbtopts" declare -r etc_sbt_opts_file="/etc/sbt/sbtopts" +declare -r default_sbt_opts="-Xss4m" usage() { cat < Date: Tue, 6 Apr 2021 22:18:08 +0900 Subject: [PATCH 2/2] Match the memory setting --- build/sbt-launch-lib.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/sbt-launch-lib.bash b/build/sbt-launch-lib.bash index 1d79989f3c3c3..8fb6672bddc4d 100755 --- a/build/sbt-launch-lib.bash +++ b/build/sbt-launch-lib.bash @@ -17,7 +17,7 @@ declare -a java_args declare -a scalac_args declare -a sbt_commands declare -a maven_profiles -declare sbt_default_mem=2048 +declare sbt_default_mem=4096 if test -x "$JAVA_HOME/bin/java"; then echo -e "Using $JAVA_HOME as default JAVA_HOME."