Gradle 7.0 compatibility

nebula-plugins · Feb 18, 2021 · ad6fcc4 · ad6fcc4
1 parent 323c256
commit ad6fcc4
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/src/main/groovy/com/moowork/gradle/node/yarn/YarnInstallTask.groovy b/src/main/groovy/com/moowork/gradle/node/yarn/YarnInstallTask.groovy
@@ -16,6 +16,7 @@ class YarnInstallTask
 
     public YarnInstallTask()
     {
+        super(true)
         this.group = 'Node'
         this.description = 'Install node packages using Yarn.'
         setYarnCommand( '' )

diff --git a/src/main/groovy/com/moowork/gradle/node/yarn/YarnTask.groovy b/src/main/groovy/com/moowork/gradle/node/yarn/YarnTask.groovy
@@ -5,6 +5,8 @@ import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 import org.gradle.process.ExecResult
 
+import javax.inject.Inject
+
 class YarnTask
     extends DefaultTask
 {
@@ -16,23 +18,40 @@ class YarnTask
 
     private String[] yarnCommand
 
-    public YarnTask()
+    @Inject
+    public YarnTask() {
+        this(false)
+    }
+
+    public YarnTask(boolean afterEvaluateConfiguration)
     {
         this.runner = new YarnExecRunner( this.project )
         dependsOn( YarnSetupTask.NAME )
 
-        this.project.afterEvaluate {
-            if ( !this.runner.workingDir )
-            {
+        def initWorkDir = {
+            if (!this.runner.workingDir) {
                 def workingDir = this.project.node.nodeModulesDir
-                setWorkingDir( workingDir )
+                setWorkingDir(workingDir)
             }
 
-            if ( !this.runner.workingDir.exists() )
-            {
+            if (!this.runner.workingDir.exists()) {
                 this.runner.workingDir.mkdirs();
             }
         }
+
+        //This class is used from different contexts.
+        //1) it is a parent for a usually created task - in that case we need to initialize
+        //   working directory after evaluation so we can capture customizations
+        //2) task created by a rule. In that case we are already after evaluation and we don't need to
+        //   wait with configuration. Gradle 7+ actually fails if you invoke after evaluate
+        //   if a project is past that phase
+        if (afterEvaluateConfiguration) {
+            this.project.afterEvaluate {
+                initWorkDir()
+            }
+        } else {
+            initWorkDir()
+        }
     }
 
     void setArgs( final Iterable<?> value )