diff --git a/bin/linoleum b/bin/linoleum index 39651deb..86a6bf5a 100755 --- a/bin/linoleum +++ b/bin/linoleum @@ -1,4 +1,4 @@ #!/bin/sh LINOLEUM=`readlink -f $0` LINOLEUM_HOME=`dirname $LINOLEUM`/.. -java -Djava.system.class.loader=linoleum.application.ClassLoader -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false -jar $LINOLEUM_HOME/linoleum.jar +java -Djava.system.class.loader=linoleum.application.ClassLoader -Dscala.usejavacp=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false -jar $LINOLEUM_HOME/linoleum.jar diff --git a/bin/linoleum.bat b/bin/linoleum.bat index eaa09d8b..60de84c0 100644 --- a/bin/linoleum.bat +++ b/bin/linoleum.bat @@ -1,3 +1,3 @@ @echo off set LINOLEUM_HOME=%~dp0.. -java -Dfile.encoding=UTF-8 -Djava.system.class.loader=linoleum.application.ClassLoader -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false -jar %LINOLEUM_HOME%\linoleum.jar +java -Dfile.encoding=UTF-8 -Djava.system.class.loader=linoleum.application.ClassLoader -Dscala.usejavacp=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false -jar %LINOLEUM_HOME%\linoleum.jar diff --git a/complete/ivy.xml b/complete/ivy.xml index eb8c7922..66c28526 100644 --- a/complete/ivy.xml +++ b/complete/ivy.xml @@ -20,6 +20,5 @@ - diff --git a/complete/pom.xml b/complete/pom.xml index 8eafc1b4..d17c2fb9 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -40,10 +40,5 @@ diffutils 1.3.0 - - com.github.rjolly - jshellscriptengine - 1.0 - diff --git a/init.js b/init.js index 21bde2a4..907f0627 100644 --- a/init.js +++ b/init.js @@ -455,7 +455,7 @@ function scaladoc(srcDir, destDir, options) { Packages.scala.tools.nsc.ScalaDoc$.MODULE$.process(["-classpath", classpath(), "-d", dir].concat(options).concat(files)); } -// requires com.github.rjolly#jarlister_2.11;1.0 +// requires com.github.rjolly#jarlister_2.11;1.1 function jarlister(path, out) { var opts = []; diff --git a/readme.txt b/readme.txt index f490b7c6..d4140536 100644 --- a/readme.txt +++ b/readme.txt @@ -88,5 +88,5 @@ Scala Scala 2.11 org.scala-lang#scala-compiler;2.11.0-M6 Compiler for the Scala Programming Language - com.github.rjolly#jarlister_2.11;1.0 A tools that lists a jars classes into its manifest + com.github.rjolly#jarlister_2.11;1.1 A tool that lists a jar's classes into its manifest