Skip to content
Browse files

- Update to SBT 0.12.0-M1

- Push down system property java.util.logging.config.file to more localized scope
- Tweak liftsh properties to be more reliable and have lower footprint
  • Loading branch information...
1 parent 4fef219 commit 9e27e1c03864a5fb60cdf77ec37ee40389e97d51 @indrajitr indrajitr committed
View
8 liftsh
@@ -6,12 +6,12 @@ if test -f ~/.liftsh.config; then
fi
# Internal options, always specified
-INTERNAL_OPTS="-Dfile.encoding=UTF-8 -Xss8M -Xmx1G -noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512M"
+INTERNAL_OPTS="-Dfile.encoding=UTF-8 -Xmx768m -noverify -XX:ReservedCodeCacheSize=96m -XX:+UseCompressedOops -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m"
# Default options, if nothing is specified
-DEFAULT_OPTS="-Dsbt.intransitive=true -Djava.util.logging.config.file=logging.properties"
+DEFAULT_OPTS=""
cd `dirname $0`
-# Call with INTERNAL_OPTS followed by LIFTSH_OPTS (or DEFAULT_OPTS). java aways takes the last option when duplicate.
-exec java ${INTERNAL_OPTS} ${LIFTSH_OPTS:-${DEFAULT_OPTS}} -jar project/sbt-launch-0.11.2.jar "$@"
+# Call with INTERNAL_OPTS followed by LIFTSH_OPTS (or DEFAULT_OPTS). java always takes the last option when duplicate.
+exec java ${INTERNAL_OPTS} ${LIFTSH_OPTS:-${DEFAULT_OPTS}} -jar project/sbt-launch-0.12.0-M1.jar "$@"
View
8 liftsh.cmd
@@ -1,14 +1,14 @@
@echo off
@REM Internal options, always specified
-set INTERNAL_OPTS=-Dfile.encoding=UTF-8 -Xss8M -Xmx1G -noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512M
+set INTERNAL_OPTS=-Dfile.encoding=UTF-8 -Xmx768m -noverify -XX:ReservedCodeCacheSize=96m -XX:+UseCompressedOops -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m
@REM Default options, if nothing is specified
-set DEFAULT_OPTS=-Dsbt.intransitive=true
+set DEFAULT_OPTS=
if "%LIFTSH_OPTS%"=="" (
set LIFTSH_OPTS=%DEFAULT_OPTS%
)
-@REM Call with INTERNAL_OPTS followed by LIFTSH_OPTS (or DEFAULT_OPTS). java aways takes the last option when duplicate.
-java %INTERNAL_OPTS% %LIFTSH_OPTS% -jar "%~dp0\project\sbt-launch-0.11.2.jar" %*
+@REM Call with INTERNAL_OPTS followed by LIFTSH_OPTS (or DEFAULT_OPTS). java always takes the last option when duplicate.
+java %INTERNAL_OPTS% %LIFTSH_OPTS% -jar "%~dp0\project\sbt-launch-0.12.0-M1.jar" %*
View
0 logging.properties → ...odb/src/test/resources/logging.properties
File renamed without changes.
View
BIN project/sbt-launch-0.11.2.jar → project/sbt-launch-0.12.0-M1.jar
Binary file not shown.

0 comments on commit 9e27e1c

Please sign in to comment.
Something went wrong with that request. Please try again.