Minor improvement in NpmRunTask

tlinkowski · Sep 7, 2019 · ff8f3e2 · ff8f3e2
1 parent 104a13f
commit ff8f3e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/...ski/gradle/my/superpom/shared/internal/configurator/MyComprehensiveReleaseConfigurator.kt b/...ski/gradle/my/superpom/shared/internal/configurator/MyComprehensiveReleaseConfigurator.kt
@@ -89,7 +89,7 @@ internal class MyComprehensiveReleaseConfigurator(tasks: TaskContainer) {
     }
 
     generateChangelog {
-      scriptName("gren-changelog")
+      scriptName = "gren-changelog"
       dependsOn(addTemporaryVersionTag) // Git tag is needed for gren to be able to generate the changelog
       finalizedBy(removeTemporaryVersionTag) // we remove the Git tag immediately after gren runs
       onlyIfNotDryRun()
@@ -127,7 +127,7 @@ internal class MyComprehensiveReleaseConfigurator(tasks: TaskContainer) {
     }
 
     releaseToGitHub {
-      scriptName("gren-release")
+      scriptName = "gren-release"
       dependsOn(confirmFinalPublication)
       onlyIfNotDryRun()
     }

diff --git a/...c/main/kotlin/pl/tlinkowski/gradle/my/superpom/shared/internal/task/generic/NpmRunTask.kt b/...c/main/kotlin/pl/tlinkowski/gradle/my/superpom/shared/internal/task/generic/NpmRunTask.kt
@@ -18,7 +18,7 @@
 
 package pl.tlinkowski.gradle.my.superpom.shared.internal.task.generic
 
-import org.gradle.api.tasks.Exec
+import org.gradle.api.tasks.*
 import pl.tlinkowski.gradle.my.superpom.shared.internal.TaskGroupNames
 import pl.tlinkowski.gradle.my.superpom.shared.internal.isWindows
 
@@ -36,9 +36,14 @@ internal open class NpmRunTask : Exec() {
   }
 
   /**
-   * @param scriptName script name defined in `package.json`
+   * Script name defined in `package.json`.
    */
-  fun scriptName(scriptName: String) {
+  @get:Input
+  lateinit var scriptName: String
+
+  @TaskAction
+  override fun exec() {
     args("run", scriptName)
+    super.exec()
   }
 }