Build: Introduce Project extension properties for source sets

buildSrc/src/main/kotlin/CommonUtil.kt

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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")