Fix issue #34. Improve inputs definition for the npmSetup and yarnSet…

…up tasks.
node-gradle · Apr 19, 2020 · ed93ef3 · ed93ef3
1 parent 4f4233c
commit ed93ef3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/main/kotlin/com/github/gradle/node/npm/task/NpmSetupTask.kt b/src/main/kotlin/com/github/gradle/node/npm/task/NpmSetupTask.kt
@@ -5,7 +5,6 @@ import com.github.gradle.node.NodePlugin
 import com.github.gradle.node.exec.NodeExecConfiguration
 import com.github.gradle.node.npm.exec.NpmExecRunner
 import com.github.gradle.node.task.NodeSetupTask
-import com.github.gradle.node.util.zip
 import com.github.gradle.node.variant.VariantComputer
 import org.gradle.api.Action
 import org.gradle.api.DefaultTask
@@ -55,11 +54,8 @@ open class NpmSetupTask : DefaultTask() {
     }
 
     @Input
-    open fun getInput(): Provider<Set<String>> {
-        return zip(nodeExtension.npmVersion, nodeExtension.npmWorkDir)
-                .map { (npmVersion, npmWorkingDir) ->
-                    setOf(npmVersion, npmWorkingDir.asFile.toString())
-                }
+    protected open fun getVersion(): Provider<String> {
+        return nodeExtension.npmVersion
     }
 
     // For DSL

diff --git a/src/main/kotlin/com/github/gradle/node/yarn/task/YarnSetupTask.kt b/src/main/kotlin/com/github/gradle/node/yarn/task/YarnSetupTask.kt
@@ -2,7 +2,6 @@ package com.github.gradle.node.yarn.task
 
 import com.github.gradle.node.NodePlugin
 import com.github.gradle.node.npm.task.NpmSetupTask
-import com.github.gradle.node.util.zip
 import com.github.gradle.node.variant.VariantComputer
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.Input
@@ -18,9 +17,8 @@ open class YarnSetupTask : NpmSetupTask() {
     }
 
     @Input
-    override fun getInput(): Provider<Set<String>> {
-        return zip(nodeExtension.yarnVersion, nodeExtension.yarnWorkDir)
-                .map { (yarnVersion, yarnWorkDir) -> setOf(yarnVersion, yarnWorkDir.asFile.toString()) }
+    override fun getVersion(): Provider<String> {
+        return nodeExtension.yarnVersion
     }
 
     @get:OutputDirectory