From 16b9c15133cf8d37febb6435cda7861698fd4482 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Thu, 6 Jun 2019 21:22:54 +0300 Subject: [PATCH] Build: Don't run checkBuild tasks on check, add checkBuild to buildSrc --- build.gradle.kts | 6 ++---- buildSrc/build.gradle.kts | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8190c36b0a2..2b1712ce861 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -410,10 +410,8 @@ allprojects { } // Aggregate task for build related checks - tasks.register("checkBuild") { - tasks.findByName("check")?.dependsOn(this) - } - + tasks.register("checkBuild") + apply(from = "$rootDir/gradle/cacheRedirector.gradle.kts") } } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index bf3b57c60b1..b1b5473ccb6 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -111,8 +111,9 @@ fun Project.`samWithReceiver`(configure: org.jetbrains.kotlin.samWithReceiver.gr tasks["build"].dependsOn(":prepare-deps:build") allprojects { + tasks.register("checkBuild") + afterEvaluate { apply(from = "$rootDir/../gradle/cacheRedirector.gradle.kts") - tasks["check"].dependsOn(tasks["checkRepositories"]) } } \ No newline at end of file