Extract removing bundled Kotlin plugin to separate task
This commit is contained in:
@@ -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 {
|
val prepareIvyXmls by tasks.creating {
|
||||||
dependsOn(unzipIntellijCore, unzipJpsStandalone, copyIntellijSdkSources, copyJpsBuildTest)
|
dependsOn(unzipIntellijCore, unzipJpsStandalone, copyIntellijSdkSources, copyJpsBuildTest, deleteBundledKotlinPlugin)
|
||||||
|
|
||||||
val intellijSdkDir = File(repoDir, intellij.name)
|
val intellijSdkDir = File(repoDir, intellij.name)
|
||||||
val intellijUltimateSdkDir = File(repoDir, intellijUltimate.name)
|
val intellijUltimateSdkDir = File(repoDir, intellijUltimate.name)
|
||||||
@@ -188,9 +203,6 @@ val prepareIvyXmls by tasks.creating {
|
|||||||
File(intellijSdkDir, "lib"),
|
File(intellijSdkDir, "lib"),
|
||||||
sourcesFile)
|
sourcesFile)
|
||||||
|
|
||||||
// Delete bundled Kotlin plugin
|
|
||||||
File(intellijSdkDir, "plugins/Kotlin").deleteRecursively()
|
|
||||||
|
|
||||||
File(intellijSdkDir, "plugins").listFiles { it: File -> it.isDirectory }.forEach {
|
File(intellijSdkDir, "plugins").listFiles { it: File -> it.isDirectory }.forEach {
|
||||||
writeIvyXml(it.name, "intellij.plugin.${it.name}", files("$it/lib/"), File(it, "lib"), sourcesFile)
|
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"),
|
File(intellijUltimateSdkDir, "lib"),
|
||||||
sourcesFile)
|
sourcesFile)
|
||||||
|
|
||||||
// Delete bundled Kotlin plugin
|
|
||||||
File(intellijUltimateSdkDir, "plugins/Kotlin").deleteRecursively()
|
|
||||||
|
|
||||||
File(intellijUltimateSdkDir, "plugins").listFiles { it: File -> it.isDirectory }.forEach {
|
File(intellijUltimateSdkDir, "plugins").listFiles { it: File -> it.isDirectory }.forEach {
|
||||||
writeIvyXml(it.name, "intellijUltimate.plugin.${it.name}", files("$it/lib/"), File(it, "lib"), sourcesFile)
|
writeIvyXml(it.name, "intellijUltimate.plugin.${it.name}", files("$it/lib/"), File(it, "lib"), sourcesFile)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user