diff --git a/plugin.gradle b/plugin.gradle index 5300d7a..ad25fc1 100644 --- a/plugin.gradle +++ b/plugin.gradle @@ -15,13 +15,11 @@ repositories { apply plugin: 'js' -javascript { - source { - custom { - js { - srcDir "src/test/resources" - include "file*.js" - } +javascript.source { + custom { + js { + srcDir "src/test/resources" + include "file*.js" } } } diff --git a/src/main/groovy/com/eriwen/gradle/js/RhinoExec.groovy b/src/main/groovy/com/eriwen/gradle/js/RhinoExec.groovy index cc9834d..fd7466b 100644 --- a/src/main/groovy/com/eriwen/gradle/js/RhinoExec.groovy +++ b/src/main/groovy/com/eriwen/gradle/js/RhinoExec.groovy @@ -12,12 +12,13 @@ class RhinoExec { private static final String RHINO_MAIN_CLASS = 'org.mozilla.javascript.tools.shell.Main' Project project - void execute(final Iterable execargs, final String workingDirIn = '.') { + void execute(final Iterable execargs, final String workingDirIn = '.', final Boolean ignoreExitCode = false) { def options = { main = RHINO_MAIN_CLASS classpath = project.configurations.rhino args = execargs workingDir = workingDirIn + ignoreExitValue = ignoreExitCode } project.javaexec(options) diff --git a/src/main/groovy/com/eriwen/gradle/js/tasks/JsHintTask.groovy b/src/main/groovy/com/eriwen/gradle/js/tasks/JsHintTask.groovy index ca7d52c..1b4771a 100644 --- a/src/main/groovy/com/eriwen/gradle/js/tasks/JsHintTask.groovy +++ b/src/main/groovy/com/eriwen/gradle/js/tasks/JsHintTask.groovy @@ -32,6 +32,6 @@ class JsHintTask extends SourceTask { new File(project.buildDir, TMP_DIR), JSHINT_PATH) final List args = [jshintJsFile.canonicalPath] args.addAll(source.files.collect { it.canonicalPath }) - rhino.execute(args) + rhino.execute(args, '.', true) } }