From dca73236278cb7e3c94ae7f142a89deeeb47098c Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 19 Mar 2018 17:17:10 +0100 Subject: [PATCH] [minor] fix asm sources connection --- .../prepare-deps/intellij-sdk/build.gradle.kts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts b/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts index a5d2916f2d4..3bc8608f39e 100644 --- a/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts +++ b/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts @@ -150,16 +150,23 @@ val unzipIntellijCore by tasks.creating { configureExtractFromConfigurationTask( val unzipJpsStandalone by tasks.creating { configureExtractFromConfigurationTask(`jps-standalone`) { zipTree(it.singleFile) } } -val copyIntellijSdkSources by tasks.creating(ShadowJar::class.java) { - from(sources) +val copyAsmShadedSources by tasks.creating(Copy::class.java) { from(`asm-shaded-sources`) + rename(".zip", ".jar") + destinationDir = File(repoDir, `asm-shaded-sources`.name) +} + +val copyIntellijSdkSources by tasks.creating(ShadowJar::class.java) { + from(copyAsmShadedSources) + from(sources) + baseName = "ideaIC" + version = intellijVersion + classifier = "sources" destinationDir = File(repoDir, sources.name) } val copyJpsBuildTest by tasks.creating { configureExtractFromConfigurationTask(`jps-build-test`) { it.singleFile } } -val copyAsmShadedSources by tasks.creating { configureExtractFromConfigurationTask(`asm-shaded-sources`) { it.singleFile } } - val unzipNodeJSPlugin by tasks.creating { configureExtractFromConfigurationTask(`plugins-NodeJS`) { zipTree(it.singleFile) } } fun writeIvyXml(moduleName: String, fileName: String, jarFiles: FileCollection, baseDir: File, sourcesJar: File?) {