diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index 2d897de9b55..4105af50537 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -135,4 +135,3 @@ ideaPlugin { from(jar) from(sideJars) } - diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index d08a9016a46..b1e352c7904 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -15,6 +15,7 @@ evaluationDependsOn(":prepare:idea-plugin") val intellijUltimateEnabled : Boolean by rootProject.extra val springClasspath by configurations.creating +val ideaPlugin by configurations.creating dependencies { if (intellijUltimateEnabled) { @@ -138,6 +139,8 @@ dependencies { springClasspath(commonDep("org.springframework", "spring-context")) springClasspath(commonDep("org.springframework", "spring-tx")) springClasspath(commonDep("org.springframework", "spring-web")) + + ideaPlugin(project(":prepare:idea-plugin", configuration = "runtimeJar")) } val preparedResources = File(buildDir, "prepResources") @@ -175,14 +178,15 @@ val preparePluginXml by task { } } -val communityPluginProject = ":prepare:idea-plugin" - -val jar = runtimeJar(task("shadowJar")) { +val jar = runtimeJar { duplicatesStrategy = DuplicatesStrategy.EXCLUDE dependsOn(preparePluginXml) - dependsOn("$communityPluginProject:shadowJar") - val communityPluginJar = project(communityPluginProject).configurations["runtimeJar"].artifacts.files.singleFile - from(zipTree(communityPluginJar), { exclude("META-INF/plugin.xml") }) + dependsOn(ideaPlugin) + + from(provider { zipTree(ideaPlugin.singleFile) }) { + exclude("META-INF/plugin.xml") + } + from(preparedResources, { include("META-INF/plugin.xml") }) from(mainSourceSet.output) archiveName = "kotlin-plugin.jar"