From a595fdd312f7c899f8f5e4eed7c09456572813c9 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Thu, 1 Feb 2018 17:11:08 +0300 Subject: [PATCH] Make root `dist` & `ideaPlugin` depend on all corresponding tasks in child projects --- build.gradle.kts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 94025db35ba..483d560c0f1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -350,20 +350,25 @@ allprojects { } } -task("dist") { +val distTask = task("dist") { + val childDistTasks = getTasksByName("dist", true) - this@task + dependsOn(childDistTasks) + into(distDir) from(files("compiler/cli/bin")) { into("kotlinc/bin") } from(files("license")) { into("kotlinc/license") } } val compilerCopyTask = task("idea-plugin-copy-compiler") { - shouldRunAfter(":dist") + dependsOn(distTask) into(ideaPluginDir) from(distDir) { include("kotlinc/**") } } task("ideaPlugin") { dependsOn(compilerCopyTask) + val childIdeaPluginTasks = getTasksByName("ideaPlugin", true) - this@task + dependsOn(childIdeaPluginTasks) shouldRunAfter(":prepare:idea-plugin:idea-plugin") into("$ideaPluginDir/lib") }