Build: Introduce Project extension properties for source sets

This commit is contained in:
Vyacheslav Gerasimov
2018-06-14 17:59:24 +03:00
parent 42dc6a277f
commit 01db78d776
32 changed files with 51 additions and 54 deletions
+2 -2
View File
@@ -8,7 +8,7 @@ plugins {
kotlin("jvm")
}
val ideaProjectResources = project(":idea").javaPluginConvention().sourceSets["main"].output.resourcesDir
val ideaProjectResources = project(":idea").mainSourceSet.output.resourcesDir
evaluationDependsOn(":prepare:idea-plugin")
@@ -169,7 +169,7 @@ val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
val communityPluginJar = project(communityPluginProject).configurations["runtimeJar"].artifacts.files.singleFile
from(zipTree(communityPluginJar), { exclude("META-INF/plugin.xml") })
from(preparedResources, { include("META-INF/plugin.xml") })
from(javaPluginConvention().sourceSets.getByName("main").output)
from(mainSourceSet.output)
archiveName = "kotlin-plugin.jar"
}
+2 -2
View File
@@ -8,7 +8,7 @@ plugins {
kotlin("jvm")
}
val ideaProjectResources = project(":idea").javaPluginConvention().sourceSets["main"].output.resourcesDir
val ideaProjectResources = project(":idea").mainSourceSet.output.resourcesDir
evaluationDependsOn(":prepare:idea-plugin")
@@ -168,7 +168,7 @@ val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
val communityPluginJar = project(communityPluginProject).configurations["runtimeJar"].artifacts.files.singleFile
from(zipTree(communityPluginJar), { exclude("META-INF/plugin.xml") })
from(preparedResources, { include("META-INF/plugin.xml") })
from(javaPluginConvention().sourceSets.getByName("main").output)
from(mainSourceSet.output)
archiveName = "kotlin-plugin.jar"
}
+2 -2
View File
@@ -10,7 +10,7 @@ plugins {
kotlin("jvm")
}
val ideaProjectResources = project(":idea").javaPluginConvention().sourceSets["main"].output.resourcesDir
val ideaProjectResources = project(":idea").mainSourceSet.output.resourcesDir
evaluationDependsOn(":prepare:idea-plugin")
@@ -170,7 +170,7 @@ val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
val communityPluginJar = project(communityPluginProject).configurations["runtimeJar"].artifacts.files.singleFile
from(zipTree(communityPluginJar), { exclude("META-INF/plugin.xml") })
from(preparedResources, { include("META-INF/plugin.xml") })
from(javaPluginConvention().sourceSets.getByName("main").output)
from(mainSourceSet.output)
archiveName = "kotlin-plugin.jar"
}
+2 -2
View File
@@ -10,7 +10,7 @@ plugins {
kotlin("jvm")
}
val ideaProjectResources = project(":idea").javaPluginConvention().sourceSets["main"].output.resourcesDir
val ideaProjectResources = project(":idea").mainSourceSet.output.resourcesDir
evaluationDependsOn(":prepare:idea-plugin")
@@ -171,7 +171,7 @@ val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
val communityPluginJar = project(communityPluginProject).configurations["runtimeJar"].artifacts.files.singleFile
from(zipTree(communityPluginJar), { exclude("META-INF/plugin.xml") })
from(preparedResources, { include("META-INF/plugin.xml") })
from(javaPluginConvention().sourceSets.getByName("main").output)
from(mainSourceSet.output)
archiveName = "kotlin-plugin.jar"
}