azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Introduce Project extension properties for source sets

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/CommonUtil.kt
+5 -11
View File
@@ -8,10 +8,10 @@ import org.gradle.api.file.CopySourceSpec
import org.gradle.api.file.SourceDirectorySet
import org.gradle.api.plugins.JavaPluginConvention
import org.gradle.api.tasks.SourceSet
import org.gradle.api.tasks.SourceSetContainer
import org.gradle.api.tasks.SourceSetOutput
import org.gradle.kotlin.dsl.creating
import org.gradle.kotlin.dsl.extra
import org.gradle.kotlin.dsl.get
import org.gradle.kotlin.dsl.the
import java.io.File
import java.util.concurrent.Callable
@@ -30,17 +30,11 @@ inline fun <T : Any> Project.withJavaPlugin(crossinline body: () -> T?): T? {
return res
}
fun Project.getCompiledClasses(): SourceSetOutput? = withJavaPlugin {
javaPluginConvention().sourceSets.getByName("main").output
}
fun Project.getCompiledClasses(): SourceSetOutput? = withJavaPlugin { mainSourceSet.output }
fun Project.getSources(): SourceDirectorySet? = withJavaPlugin {
javaPluginConvention().sourceSets.getByName("main").allSource
}
fun Project.getSources(): SourceDirectorySet? = withJavaPlugin { mainSourceSet.allSource }
fun Project.getResourceFiles(): SourceDirectorySet? = withJavaPlugin {
javaPluginConvention().sourceSets.getByName("main").resources
}
fun Project.getResourceFiles(): SourceDirectorySet? = withJavaPlugin { mainSourceSet.resources }
fun fileFrom(root: File, vararg children: String): File = children.fold(root) { f, c -> File(f, c) }
@@ -59,7 +53,7 @@ var Project.javaHome: String?
}
fun Project.generator(fqName: String, sourceSet: SourceSet? = null) = smartJavaExec {
classpath = (sourceSet ?: javaPluginConvention().sourceSets["test"]).runtimeClasspath
classpath = (sourceSet ?: testSourceSet).runtimeClasspath
main = fqName
workingDir = rootDir
}
buildSrc/src/main/kotlin/artifacts.kt
+2 -2
View File
@@ -23,7 +23,7 @@ fun Project.classesDirsArtifact(): FileCollection {
val classesDirsCfg = configurations.getOrCreate("classes-dirs")
val classesDirs = javaPluginConvention().sourceSets["main"].output.classesDirs
val classesDirs = mainSourceSet.output.classesDirs
val classesTask = tasks["classes"]
@@ -44,7 +44,7 @@ fun Project.testsJar(body: Jar.() -> Unit = {}): Jar {
return task<Jar>(MAGIC_DO_NOT_CHANGE_TEST_JAR_TASK_NAME) {
dependsOn("testClasses")
pluginManager.withPlugin("java") {
from(project.javaPluginConvention().sourceSets.getByName("test").output)
from(testSourceSet.output)
}
classifier = "tests"
body()
buildSrc/src/main/kotlin/instrument.kt
+2 -3
View File
@@ -45,7 +45,6 @@ fun Project.configureInstrumentation() {
// classes from the "friendly directory" to the compile classpath.
val testCompile = tasks.findByName("compileTestKotlin") as AbstractCompile?
testCompile?.doFirst {
val mainSourceSet = javaPluginConvention().sourceSets.getByName("main")
testCompile.classpath = (testCompile.classpath
- mainSourceSet.output.classesDirs
+ files((mainSourceSet as ExtensionAware).extra.get("classesDirsCopy")))
@@ -59,7 +58,7 @@ fun Project.configureInstrumentation() {
}
afterEvaluate {
javaPluginConvention().sourceSets.all { sourceSetParam ->
sourceSets.all { sourceSetParam ->
// This copy will ignore filters, but they are unlikely to be used.
val classesDirs = (sourceSetParam.output.classesDirs as ConfigurableFileCollection).from as Collection<Any>
@@ -150,7 +149,7 @@ open class IntelliJInstrumentCodeTask : ConventionTask() {
// Instrumentation needs to have access to sources of forms for inclusion
val depSourceDirectorySets = project.configurations["compile"].dependencies.withType(ProjectDependency::class.java)
.map { p -> p.dependencyProject.javaPluginConvention().sourceSets.getByName("main").allSource.sourceDirectories }
.map { p -> p.dependencyProject.mainSourceSet.allSource.sourceDirectories }
val instrumentationClasspath =
depSourceDirectorySets.fold(sourceSet!!.compileClasspath) { acc, v -> acc + v }.asPath.also {
logger.info("Using following dependency source dirs: $it")
buildSrc/src/main/kotlin/instrument.kt.182
+2 -3
View File
@@ -45,7 +45,6 @@ fun Project.configureInstrumentation() {
// classes from the "friendly directory" to the compile classpath.
val testCompile = tasks.findByName("compileTestKotlin") as AbstractCompile?
testCompile?.doFirst {
val mainSourceSet = javaPluginConvention().sourceSets.getByName("main")
testCompile.classpath = (testCompile.classpath
- mainSourceSet.output.classesDirs
+ files((mainSourceSet as ExtensionAware).extra.get("classesDirsCopy")))
@@ -59,7 +58,7 @@ fun Project.configureInstrumentation() {
}
afterEvaluate {
javaPluginConvention().sourceSets.all { sourceSetParam ->
sourceSets.all { sourceSetParam ->
// This copy will ignore filters, but they are unlikely to be used.
val classesDirs = (sourceSetParam.output.classesDirs as ConfigurableFileCollection).from as Collection<Any>
@@ -150,7 +149,7 @@ open class IntelliJInstrumentCodeTask : ConventionTask() {
// Instrumentation needs to have access to sources of forms for inclusion
val depSourceDirectorySets = project.configurations["compile"].dependencies.withType(ProjectDependency::class.java)
.map { p -> p.dependencyProject.javaPluginConvention().sourceSets.getByName("main").allSource.sourceDirectories }
.map { p -> p.dependencyProject.mainSourceSet.allSource.sourceDirectories }
val instrumentationClasspath =
depSourceDirectorySets.fold(sourceSet!!.compileClasspath) { acc, v -> acc + v }.asPath.also {
logger.info("Using following dependency source dirs: $it")
buildSrc/src/main/kotlin/intellijDependencies.kt
+1 -1
View File
@@ -123,7 +123,7 @@ fun Project.runIdeTask(name: String, ideaPluginDir: File, ideaSandboxDir: File,
return task<JavaExec>(name) {
val ideaSandboxConfigDir = File(ideaSandboxDir, "config")
classpath = javaPluginConvention().sourceSets["main"].runtimeClasspath
classpath = mainSourceSet.runtimeClasspath
main = "com.intellij.idea.Main"
buildSrc/src/main/kotlin/sourceSets.kt
+8 -2
View File
@@ -13,7 +13,7 @@ class SourceSetsBuilder(val project: Project) {
inline operator fun String.invoke(crossinline body: SourceSet.() -> Unit): SourceSet {
val sourceSetName = this
return project.javaPluginConvention().sourceSets.maybeCreate(sourceSetName).apply {
return project.sourceSets.maybeCreate(sourceSetName).apply {
none()
body()
}
@@ -52,8 +52,14 @@ fun SourceSet.projectDefault() {
fun Project.getSourceSetsFrom(projectPath: String): SourceSetContainer {
evaluationDependsOn(projectPath)
return project(projectPath).javaPluginConvention().sourceSets
return project(projectPath).sourceSets
}
val Project.sourceSets: SourceSetContainer
get() = javaPluginConvention().sourceSets
val Project.mainSourceSet: SourceSet
get() = sourceSets.getByName("main")
val Project.testSourceSet: SourceSet
get() = sourceSets.getByName("test")
buildSrc/src/main/kotlin/tasks.kt
+1 -1
View File
@@ -94,7 +94,7 @@ fun Project.projectTest(taskName: String = "test", body: Test.() -> Unit = {}):
systemProperty("idea.is.unit.test", "true")
systemProperty("idea.home.path", intellijRootDir().canonicalPath)
environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
environment("PROJECT_CLASSES_DIRS", javaPluginConvention().sourceSets.getByName("test").output.classesDirs.asPath)
environment("PROJECT_CLASSES_DIRS", testSourceSet.output.classesDirs.asPath)
environment("PROJECT_BUILD_DIR", buildDir)
systemProperty("jps.kotlin.home", rootProject.extra["distKotlinHomeDir"]!!)
systemProperty("kotlin.ni", if (rootProject.hasProperty("newInferenceTests")) "true" else "false")
compiler/build.gradle.kts
+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")
compiler/daemon/daemon-client/build.gradle.kts
+1 -1
View File
@@ -35,7 +35,7 @@ sourceSets {
noDefaultJar()
runtimeJar(task<ShadowJar>("shadowJar")) {
from(javaPluginConvention().sourceSets.getByName("main").output)
from(mainSourceSet.output)
fromEmbeddedComponents()
}
compiler/daemon/daemon-client/build.gradle.kts.173
+1 -1
View File
@@ -34,7 +34,7 @@ sourceSets {
noDefaultJar()
runtimeJar(task<ShadowJar>("shadowJar")) {
from(javaPluginConvention().sourceSets.getByName("main").output)
from(mainSourceSet.output)
fromEmbeddedComponents()
}
compiler/tests-java8/build.gradle.kts
+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)
}
generators/build.gradle.kts
+1 -1
View File
@@ -9,7 +9,7 @@ sourceSets {
"test" { projectDefault() }
}
val builtinsSourceSet = javaPluginConvention().sourceSets.create("builtins") {
val builtinsSourceSet = sourceSets.create("builtins") {
java.srcDir("builtins")
}
val builtinsCompile by configurations
generators/build.gradle.kts.as31
+1 -1
View File
@@ -9,7 +9,7 @@ sourceSets {
"test" { projectDefault() }
}
val builtinsSourceSet = javaPluginConvention().sourceSets.create("builtins") {
val builtinsSourceSet = sourceSets.create("builtins") {
java.srcDir("builtins")
}
val builtinsCompile by configurations
generators/build.gradle.kts.as32
+1 -1
View File
@@ -9,7 +9,7 @@ sourceSets {
"test" { projectDefault() }
}
val builtinsSourceSet = javaPluginConvention().sourceSets.create("builtins") {
val builtinsSourceSet = sourceSets.create("builtins") {
java.srcDir("builtins")
}
val builtinsCompile by configurations
idea/build.gradle.kts
-1
View File
@@ -128,7 +128,6 @@ val performanceTestRuntime by configurations.creating {
}
val performanceTest by run {
val sourceSets = javaPluginConvention().sourceSets
sourceSets.creating {
compileClasspath += sourceSets["test"].output
compileClasspath += sourceSets["main"].output
j2k/build.gradle.kts
+1 -1
View File
@@ -60,7 +60,7 @@ testsJar()
val testForWebDemo by task<Test> {
include("**/*JavaToKotlinConverterForWebDemoTestGenerated*")
classpath = javaPluginConvention().sourceSets["test"].runtimeClasspath
classpath = testSourceSet.runtimeClasspath
workingDir = rootDir
}
val cleanTestForWebDemo by tasks
j2k/build.gradle.kts.173
+1 -1
View File
@@ -58,7 +58,7 @@ testsJar()
val testForWebDemo by task<Test> {
include("**/*JavaToKotlinConverterForWebDemoTestGenerated*")
classpath = javaPluginConvention().sourceSets["test"].runtimeClasspath
classpath = testSourceSet.runtimeClasspath
workingDir = rootDir
}
val cleanTestForWebDemo by tasks
j2k/build.gradle.kts.as31
+1 -1
View File
@@ -59,7 +59,7 @@ testsJar()
val testForWebDemo by task<Test> {
include("**/*JavaToKotlinConverterForWebDemoTestGenerated*")
classpath = javaPluginConvention().sourceSets["test"].runtimeClasspath
classpath = testSourceSet.runtimeClasspath
workingDir = rootDir
}
val cleanTestForWebDemo by tasks
j2k/build.gradle.kts.as32
+1 -1
View File
@@ -60,7 +60,7 @@ testsJar()
val testForWebDemo by task<Test> {
include("**/*JavaToKotlinConverterForWebDemoTestGenerated*")
classpath = javaPluginConvention().sourceSets["test"].runtimeClasspath
classpath = testSourceSet.runtimeClasspath
workingDir = rootDir
}
val cleanTestForWebDemo by tasks
libraries/kotlinx-metadata/jvm/build.gradle.kts
+1 -1
View File
@@ -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)
libraries/reflect/build.gradle.kts
+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/**")
}
libraries/tools/kotlinp/build.gradle.kts
+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"
}
prepare/compiler-client-embeddable/build.gradle.kts
+1 -1
View File
@@ -42,7 +42,7 @@ projectTest {
":kotlin-script-runtime:dist")
workingDir = File(rootDir, "libraries/tools/kotlin-compiler-client-embeddable-test/src")
doFirst {
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("compilerJar", testRuntimeCompilerJar.singleFile.canonicalPath)
systemProperty("stdlibJar", testStdlibJar.singleFile.canonicalPath)
systemProperty("scriptRuntimeJar", testScriptRuntimeJar.singleFile.canonicalPath)
prepare/compiler/build.gradle.kts
+1 -1
View File
@@ -37,7 +37,7 @@ val compilerModules: Array<String> by rootProject.extra
compilerModules.forEach { evaluationDependsOn(it) }
val compiledModulesSources = compilerModules.map {
project(it).javaPluginConvention().sourceSets.getByName("main").allSource
project(it).mainSourceSet.allSource
}
dependencies {
prepare/compiler/build.gradle.kts.173
+1 -1
View File
@@ -37,7 +37,7 @@ val compilerModules: Array<String> by rootProject.extra
compilerModules.forEach { evaluationDependsOn(it) }
val compiledModulesSources = compilerModules.map {
project(it).javaPluginConvention().sourceSets.getByName("main").allSource
project(it).mainSourceSet.allSource
}
dependencies {
prepare/compiler/build.gradle.kts.182
+1 -1
View File
@@ -37,7 +37,7 @@ val compilerModules: Array<String> by rootProject.extra
compilerModules.forEach { evaluationDependsOn(it) }
val compiledModulesSources = compilerModules.map {
project(it).javaPluginConvention().sourceSets.getByName("main").allSource
project(it).mainSourceSet.allSource
}
dependencies {
prepare/formatter/build.gradle.kts
+1 -1
View File
@@ -10,7 +10,7 @@ runtimeJar {
dependsOn(":idea:formatter:classes")
project(":idea:formatter").let { p ->
p.pluginManager.withPlugin("java") {
from(p.javaPluginConvention().sourceSets.getByName("main").output)
from(p.mainSourceSet.output)
}
}
from(fileTree("$rootDir/idea/formatter")) { include("src/**") } // Eclipse formatter sources navigation depends on this
prepare/ide-lazy-resolver/build.gradle.kts
+1 -1
View File
@@ -32,7 +32,7 @@ runtimeJar {
dependsOn(":idea:ide-common:classes")
project(":idea:ide-common").let { p ->
p.pluginManager.withPlugin("java") {
from(p.javaPluginConvention().sourceSets.getByName("main").output)
from(p.mainSourceSet.output)
}
}
from(fileTree("$rootDir/idea/ide-common")) { include("src/**") } // Eclipse formatter sources navigation depends on this
ultimate/build.gradle.kts
+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"
}
ultimate/build.gradle.kts.173
+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"
}
ultimate/build.gradle.kts.as31
+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"
}
ultimate/build.gradle.kts.as32
+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"
}