Merge pull request #1 from rmarma/fix-task-configuration-avoidance

Fix: Task Configuration Avoidance
rmarma · May 25, 2023 · 108de7f · 108de7f
2 parents 45d910f + 0b5b602
commit 108de7f
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/plugin/src/main/kotlin/ru/cian/huawei/publish/HuaweiPublishPlugin.kt b/plugin/src/main/kotlin/ru/cian/huawei/publish/HuaweiPublishPlugin.kt
@@ -35,12 +35,13 @@ class HuaweiPublishPlugin : Plugin<Project> {
     private fun createTask(project: Project, variant: ApplicationVariant) {
         val variantName = variant.name.capitalize()
         val publishTaskName = "${HuaweiPublishTask.TASK_NAME}$variantName"
-        val publishTask = project.tasks.register<HuaweiPublishTask>(publishTaskName, variant)
-
-        project.tasks.whenTaskAdded {
-            if (this.name == "assemble$variantName" || this.name == "bundle$variantName") {
-                publishTask.get().mustRunAfter(this)
-            }
+        project.tasks.register<HuaweiPublishTask>(publishTaskName, variant).configure {
+            setMustRunAfter(
+                setOf(
+                    project.tasks.named("assemble$variantName"),
+                    project.tasks.named("bundle$variantName"),
+                )
+            )
         }
     }
 }