From 9a672f869d86c135f8f9bdcb8ee9ca1c2f8781c4 Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Wed, 12 Apr 2017 15:00:42 +0300 Subject: [PATCH] Quick fix for IDEA-171345, always clean Kotlin plugin --- build/dependencies/setupKotlin.gradle | 3 ++- .../intellij/build/impl/CompilationContextImpl.groovy | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/dependencies/setupKotlin.gradle b/build/dependencies/setupKotlin.gradle index 3f5eb2ef7dde..428a7c47b1e6 100644 --- a/build/dependencies/setupKotlin.gradle +++ b/build/dependencies/setupKotlin.gradle @@ -44,4 +44,5 @@ task setupKotlinPlugin(dependsOn: configurations.kotlinPlugin) { into outputDir } } -} \ No newline at end of file +} +setupKotlinPlugin.dependsOn cleanSetupKotlinPlugin \ No newline at end of file diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy index 4aaaaacf1468..6d7be443bf85 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy @@ -122,7 +122,7 @@ class CompilationContextImpl implements CompilationContext { private static void setupDependencies(BuildMessages messages, String communityHome) { messages.info("Setting up compilation dependencies") - if (!BuildUtils.gradle(new File(communityHome, 'build/dependencies/'), 'setupJdks', 'cleanSetupKotlinPlugin', 'setupKotlinPlugin')) { + if (!BuildUtils.gradle(new File(communityHome, 'build/dependencies/'), 'setupJdks', 'setupKotlinPlugin')) { messages.error("Cannot setup compilation dependencies") } }