From 3e67bfd9b34b8b7f5d5c6da9df20d1f60e0c09dd Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 31 Jan 2018 20:04:17 +0300 Subject: [PATCH] Exclude Kotlin plugin when unzipping intellij sdk --- .../intellij-sdk/build.gradle.kts | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts b/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts index 6e0077920e8..488c9eec05b 100644 --- a/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts +++ b/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts @@ -113,10 +113,20 @@ fun removePathPrefix(path: String): String { } val unzipIntellijSdk by tasks.creating { - configureExtractFromConfigurationTask(intellij, pathRemap = { removePathPrefix(it) }) { zipTree(it.singleFile) } + configureExtractFromConfigurationTask(intellij, pathRemap = { removePathPrefix(it) }) { + zipTree(it.singleFile).matching { + exclude("plugins/Kotlin/**") + } + } } -val unzipIntellijUltimateSdk by tasks.creating { configureExtractFromConfigurationTask(intellijUltimate) { zipTree(it.singleFile) } } +val unzipIntellijUltimateSdk by tasks.creating { + configureExtractFromConfigurationTask(intellijUltimate) { + zipTree(it.singleFile).matching { + exclude("plugins/Kotlin/**") + } + } +} val unzipIntellijCore by tasks.creating { configureExtractFromConfigurationTask(`intellij-core`) { zipTree(it.singleFile) } } @@ -148,23 +158,8 @@ 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, deleteBundledKotlinPlugin) + dependsOn(unzipIntellijCore, unzipJpsStandalone, copyIntellijSdkSources, copyJpsBuildTest) val intellijSdkDir = File(repoDir, intellij.name) val intellijUltimateSdkDir = File(repoDir, intellijUltimate.name)