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
@@ -49,7 +49,7 @@ val shadowJar = task<ShadowJar>("shadowJar") {
callGroovy("manifestAttributes", manifest, project)
manifest.attributes["Implementation-Version"] = version
from(javaPluginConvention().sourceSets["main"].output)
from(mainSourceSet.output)
exclude("**/*.proto")
configurations = listOf(shadows)
+3 -3
View File
@@ -127,11 +127,11 @@ val reflectShadowJar by task<ShadowJar> {
version = null
callGroovy("manifestAttributes", manifest, project, "Main", true)
from(javaPluginConvention().sourceSets.getByName("main").output)
from(project(":core:descriptors.jvm").javaPluginConvention().sourceSets.getByName("main").resources) {
from(mainSourceSet.output)
from(project(":core:descriptors.jvm").mainSourceSet.resources) {
include("META-INF/services/**")
}
from(project(":core:deserialization").javaPluginConvention().sourceSets.getByName("main").resources) {
from(project(":core:deserialization").mainSourceSet.resources) {
include("META-INF/services/**")
}
+1 -1
View File
@@ -32,7 +32,7 @@ val shadowJar by task<ShadowJar> {
classifier = "shadow"
version = null
configurations = listOf(shadows)
from(javaPluginConvention().sourceSets.getByName("main").output)
from(mainSourceSet.output)
manifest {
attributes["Main-Class"] = "org.jetbrains.kotlin.kotlinp.Main"
}