updated gradle-node-plugin to version 1.1.0

ehirsch · Dec 11, 2017 · 6163819 · 6163819
1 parent 2252864
commit 6163819
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ group = 'net.eikehirsch.react'
 
 dependencies {
 //    compile gradleApi() // added by the plugindev-plugin
-    compile 'com.moowork.gradle:gradle-node-plugin:0.9'
+    compile 'com.moowork.gradle:gradle-node-plugin:1.1.0'
     testCompile 'junit:junit:4.11'
     testCompile( 'org.spockframework:spock-core:0.7-groovy-2.0' ) {
         exclude module: 'groovy-all'

diff --git a/src/main/groovy/net/eikehirsch/gradle/react/JSXTask.groovy b/src/main/groovy/net/eikehirsch/gradle/react/JSXTask.groovy
@@ -18,8 +18,8 @@ class JSXTask extends NodeTask {
 
     @OutputDirectory destDir
 
-	JSXOptions options = new JSXOptions()
-	
+    JSXOptions jsxOptions = new JSXOptions()
+
 
 	JSXTask() {
         this.group = 'React'
@@ -32,7 +32,7 @@ class JSXTask extends NodeTask {
         JSXExtension config = project.extensions.getByName(JSXExtension.NAME) as JSXExtension
         sourcesDir = config.sourcesDir ?: DEFAULT_SOURCES_DIR
         destDir = config.destDir ?: DEFAULT_DEST_DIR
-	    options = config.getOptions() ?: options
+        jsxOptions = config.getOptions() ?: jsxOptions
     }
 
     @Override
@@ -51,7 +51,7 @@ class JSXTask extends NodeTask {
             out.mkdirs()
         }
 
-	    def args = options.toArgsArray()
+	    def args = jsxOptions.toArgsArray()
 	    args << getSourcesDir().absolutePath
 	    args << out.absolutePath
         setArgs args
@@ -68,8 +68,8 @@ class JSXTask extends NodeTask {
     }
 
 	@SuppressWarnings("GroovyUnusedDeclaration")
-	options(Closure<JSXOptions> optionsClosure) {
-		ConfigureUtil.configure(optionsClosure, options)
+    jsxOptions(Closure<JSXOptions> optionsClosure) {
+		ConfigureUtil.configure(optionsClosure, jsxOptions)
 		return this
 	}
 

diff --git a/src/main/groovy/net/eikehirsch/gradle/react/ReactInstallTask.groovy b/src/main/groovy/net/eikehirsch/gradle/react/ReactInstallTask.groovy
@@ -1,6 +1,6 @@
 package net.eikehirsch.gradle.react
 
-import com.moowork.gradle.node.task.NpmTask
+import com.moowork.gradle.node.npm.NpmTask
 
 class ReactInstallTask extends NpmTask {
 

diff --git a/src/test/groovy/net/eikehirsch/gradle/react/JSXTaskSpec.groovy b/src/test/groovy/net/eikehirsch/gradle/react/JSXTaskSpec.groovy
@@ -130,7 +130,7 @@ class JSXTaskSpec extends Specification {
 		JSXTask task = project.tasks.jsx
 		task.sourcesDir == project.file('src/react')
 		task.destDir == project.file('out')
-		task.options.extension == 'jsx'
+		task.jsxOptions.extension == 'jsx'
   }