From e20b6738f66dafe7c139e589cdf8e54bd6ee2cec Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 31 Jan 2018 18:53:59 +0300 Subject: [PATCH] Extract removing bundled Kotlin plugin to separate task --- .../intellij-sdk/build.gradle.kts | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts b/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts index 1fa5935f0e8..6e0077920e8 100644 --- a/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts +++ b/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts @@ -148,8 +148,23 @@ fun writeIvyXml(moduleName: String, fileName: String, jarFiles: FileCollection, } } +val deleteBundledKotlinPlugin by tasks.creating(Delete::class) { + shouldRunAfter(unzipIntellijSdk, unzipIntellijUltimateSdk) + + val intellijSdkDir = File(repoDir, intellij.name) + val intellijUltimateSdkDir = File(repoDir, intellijUltimate.name) + + if (installIntellijCommunity) { + delete(File(intellijSdkDir, "plugins/Kotlin")) + } + + if (installIntellijUltimate) { + delete(File(intellijUltimateSdkDir, "plugins/Kotlin")) + } +} + val prepareIvyXmls by tasks.creating { - dependsOn(unzipIntellijCore, unzipJpsStandalone, copyIntellijSdkSources, copyJpsBuildTest) + dependsOn(unzipIntellijCore, unzipJpsStandalone, copyIntellijSdkSources, copyJpsBuildTest, deleteBundledKotlinPlugin) val intellijSdkDir = File(repoDir, intellij.name) val intellijUltimateSdkDir = File(repoDir, intellijUltimate.name) @@ -188,9 +203,6 @@ val prepareIvyXmls by tasks.creating { File(intellijSdkDir, "lib"), sourcesFile) - // Delete bundled Kotlin plugin - File(intellijSdkDir, "plugins/Kotlin").deleteRecursively() - File(intellijSdkDir, "plugins").listFiles { it: File -> it.isDirectory }.forEach { writeIvyXml(it.name, "intellij.plugin.${it.name}", files("$it/lib/"), File(it, "lib"), sourcesFile) } @@ -202,9 +214,6 @@ val prepareIvyXmls by tasks.creating { File(intellijUltimateSdkDir, "lib"), sourcesFile) - // Delete bundled Kotlin plugin - File(intellijUltimateSdkDir, "plugins/Kotlin").deleteRecursively() - File(intellijUltimateSdkDir, "plugins").listFiles { it: File -> it.isDirectory }.forEach { writeIvyXml(it.name, "intellijUltimate.plugin.${it.name}", files("$it/lib/"), File(it, "lib"), sourcesFile) }