Build: Depend on :prepare:idea-plugin via configuration in ultimate

This commit is contained in:
Vyacheslav Gerasimov
2019-03-14 21:52:54 +03:00
parent d554b5aafa
commit f4472fd68a
2 changed files with 10 additions and 7 deletions
-1
View File
@@ -135,4 +135,3 @@ ideaPlugin {
from(jar) from(jar)
from(sideJars) from(sideJars)
} }
+10 -6
View File
@@ -15,6 +15,7 @@ evaluationDependsOn(":prepare:idea-plugin")
val intellijUltimateEnabled : Boolean by rootProject.extra val intellijUltimateEnabled : Boolean by rootProject.extra
val springClasspath by configurations.creating val springClasspath by configurations.creating
val ideaPlugin by configurations.creating
dependencies { dependencies {
if (intellijUltimateEnabled) { if (intellijUltimateEnabled) {
@@ -138,6 +139,8 @@ dependencies {
springClasspath(commonDep("org.springframework", "spring-context")) springClasspath(commonDep("org.springframework", "spring-context"))
springClasspath(commonDep("org.springframework", "spring-tx")) springClasspath(commonDep("org.springframework", "spring-tx"))
springClasspath(commonDep("org.springframework", "spring-web")) springClasspath(commonDep("org.springframework", "spring-web"))
ideaPlugin(project(":prepare:idea-plugin", configuration = "runtimeJar"))
} }
val preparedResources = File(buildDir, "prepResources") val preparedResources = File(buildDir, "prepResources")
@@ -175,14 +178,15 @@ val preparePluginXml by task<Copy> {
} }
} }
val communityPluginProject = ":prepare:idea-plugin" val jar = runtimeJar {
val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE duplicatesStrategy = DuplicatesStrategy.EXCLUDE
dependsOn(preparePluginXml) dependsOn(preparePluginXml)
dependsOn("$communityPluginProject:shadowJar") dependsOn(ideaPlugin)
val communityPluginJar = project(communityPluginProject).configurations["runtimeJar"].artifacts.files.singleFile
from(zipTree(communityPluginJar), { exclude("META-INF/plugin.xml") }) from(provider { zipTree(ideaPlugin.singleFile) }) {
exclude("META-INF/plugin.xml")
}
from(preparedResources, { include("META-INF/plugin.xml") }) from(preparedResources, { include("META-INF/plugin.xml") })
from(mainSourceSet.output) from(mainSourceSet.output)
archiveName = "kotlin-plugin.jar" archiveName = "kotlin-plugin.jar"