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
+1 -1
View File
@@ -113,7 +113,7 @@ jar.from("../idea/src") {
projectTest {
dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
workingDir = rootDir
systemProperty("kotlin.test.script.classpath", javaPluginConvention().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator))
systemProperty("kotlin.test.script.classpath", testSourceSet.output.classesDirs.joinToString(File.pathSeparator))
doFirst {
systemProperty("kotlin.ant.classpath", antLauncherJar.asPath)
systemProperty("kotlin.ant.launcher.class", "org.apache.tools.ant.Main")
@@ -35,7 +35,7 @@ sourceSets {
noDefaultJar()
runtimeJar(task<ShadowJar>("shadowJar")) {
from(javaPluginConvention().sourceSets.getByName("main").output)
from(mainSourceSet.output)
fromEmbeddedComponents()
}
@@ -34,7 +34,7 @@ sourceSets {
noDefaultJar()
runtimeJar(task<ShadowJar>("shadowJar")) {
from(javaPluginConvention().sourceSets.getByName("main").output)
from(mainSourceSet.output)
fromEmbeddedComponents()
}
+1 -1
View File
@@ -27,7 +27,7 @@ projectTest {
executable = "${rootProject.extra["JDK_18"]!!}/bin/java"
dependsOn(":dist")
workingDir = rootDir
systemProperty("kotlin.test.script.classpath", javaPluginConvention().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator))
systemProperty("kotlin.test.script.classpath", testSourceSet.output.classesDirs.joinToString(File.pathSeparator))
systemProperty("idea.home.path", intellijRootDir().canonicalPath)
}