From 01db78d776572009975b37dd2a852e580431dd36 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Thu, 14 Jun 2018 17:59:24 +0300 Subject: [PATCH] Build: Introduce Project extension properties for source sets --- buildSrc/src/main/kotlin/CommonUtil.kt | 16 +++++----------- buildSrc/src/main/kotlin/artifacts.kt | 4 ++-- buildSrc/src/main/kotlin/instrument.kt | 5 ++--- buildSrc/src/main/kotlin/instrument.kt.182 | 5 ++--- buildSrc/src/main/kotlin/intellijDependencies.kt | 2 +- buildSrc/src/main/kotlin/sourceSets.kt | 10 ++++++++-- buildSrc/src/main/kotlin/tasks.kt | 2 +- compiler/build.gradle.kts | 2 +- compiler/daemon/daemon-client/build.gradle.kts | 2 +- .../daemon/daemon-client/build.gradle.kts.173 | 2 +- compiler/tests-java8/build.gradle.kts | 2 +- generators/build.gradle.kts | 2 +- generators/build.gradle.kts.as31 | 2 +- generators/build.gradle.kts.as32 | 2 +- idea/build.gradle.kts | 1 - j2k/build.gradle.kts | 2 +- j2k/build.gradle.kts.173 | 2 +- j2k/build.gradle.kts.as31 | 2 +- j2k/build.gradle.kts.as32 | 2 +- libraries/kotlinx-metadata/jvm/build.gradle.kts | 2 +- libraries/reflect/build.gradle.kts | 6 +++--- libraries/tools/kotlinp/build.gradle.kts | 2 +- .../compiler-client-embeddable/build.gradle.kts | 2 +- prepare/compiler/build.gradle.kts | 2 +- prepare/compiler/build.gradle.kts.173 | 2 +- prepare/compiler/build.gradle.kts.182 | 2 +- prepare/formatter/build.gradle.kts | 2 +- prepare/ide-lazy-resolver/build.gradle.kts | 2 +- ultimate/build.gradle.kts | 4 ++-- ultimate/build.gradle.kts.173 | 4 ++-- ultimate/build.gradle.kts.as31 | 4 ++-- ultimate/build.gradle.kts.as32 | 4 ++-- 32 files changed, 51 insertions(+), 54 deletions(-) diff --git a/buildSrc/src/main/kotlin/CommonUtil.kt b/buildSrc/src/main/kotlin/CommonUtil.kt index adaa573c414..8cdd65fb057 100644 --- a/buildSrc/src/main/kotlin/CommonUtil.kt +++ b/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 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 } diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt index d120f241632..c17743055a6 100644 --- a/buildSrc/src/main/kotlin/artifacts.kt +++ b/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(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() diff --git a/buildSrc/src/main/kotlin/instrument.kt b/buildSrc/src/main/kotlin/instrument.kt index d19e9fe721c..5492bab019f 100644 --- a/buildSrc/src/main/kotlin/instrument.kt +++ b/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 @@ -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") diff --git a/buildSrc/src/main/kotlin/instrument.kt.182 b/buildSrc/src/main/kotlin/instrument.kt.182 index a365ae19ef1..c8013297f94 100644 --- a/buildSrc/src/main/kotlin/instrument.kt.182 +++ b/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 @@ -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") diff --git a/buildSrc/src/main/kotlin/intellijDependencies.kt b/buildSrc/src/main/kotlin/intellijDependencies.kt index 49da948695f..5aca38988e8 100644 --- a/buildSrc/src/main/kotlin/intellijDependencies.kt +++ b/buildSrc/src/main/kotlin/intellijDependencies.kt @@ -123,7 +123,7 @@ fun Project.runIdeTask(name: String, ideaPluginDir: File, ideaSandboxDir: File, return task(name) { val ideaSandboxConfigDir = File(ideaSandboxDir, "config") - classpath = javaPluginConvention().sourceSets["main"].runtimeClasspath + classpath = mainSourceSet.runtimeClasspath main = "com.intellij.idea.Main" diff --git a/buildSrc/src/main/kotlin/sourceSets.kt b/buildSrc/src/main/kotlin/sourceSets.kt index bae2d592653..ec38abfb754 100644 --- a/buildSrc/src/main/kotlin/sourceSets.kt +++ b/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") diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index 3ed5f8828b4..dfb8e0b9019 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/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") diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 32096ec8d91..321a6f94b94 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -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") diff --git a/compiler/daemon/daemon-client/build.gradle.kts b/compiler/daemon/daemon-client/build.gradle.kts index 6d198cf7f8a..0608a8fcef7 100644 --- a/compiler/daemon/daemon-client/build.gradle.kts +++ b/compiler/daemon/daemon-client/build.gradle.kts @@ -35,7 +35,7 @@ sourceSets { noDefaultJar() runtimeJar(task("shadowJar")) { - from(javaPluginConvention().sourceSets.getByName("main").output) + from(mainSourceSet.output) fromEmbeddedComponents() } diff --git a/compiler/daemon/daemon-client/build.gradle.kts.173 b/compiler/daemon/daemon-client/build.gradle.kts.173 index b91373722ef..5fb9882c4a0 100644 --- a/compiler/daemon/daemon-client/build.gradle.kts.173 +++ b/compiler/daemon/daemon-client/build.gradle.kts.173 @@ -34,7 +34,7 @@ sourceSets { noDefaultJar() runtimeJar(task("shadowJar")) { - from(javaPluginConvention().sourceSets.getByName("main").output) + from(mainSourceSet.output) fromEmbeddedComponents() } diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts index e4e9c2aa321..5652a8af2ce 100644 --- a/compiler/tests-java8/build.gradle.kts +++ b/compiler/tests-java8/build.gradle.kts @@ -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) } diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index 46c51900536..868e993f697 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -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 diff --git a/generators/build.gradle.kts.as31 b/generators/build.gradle.kts.as31 index ec3923277a7..2d76692f182 100644 --- a/generators/build.gradle.kts.as31 +++ b/generators/build.gradle.kts.as31 @@ -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 diff --git a/generators/build.gradle.kts.as32 b/generators/build.gradle.kts.as32 index e46a50a5f45..4dcd0f33382 100644 --- a/generators/build.gradle.kts.as32 +++ b/generators/build.gradle.kts.as32 @@ -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 diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 8baece4c5aa..88a95e4c6cf 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -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 diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index fb7525cc1a5..3a64620313c 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -60,7 +60,7 @@ testsJar() val testForWebDemo by task { include("**/*JavaToKotlinConverterForWebDemoTestGenerated*") - classpath = javaPluginConvention().sourceSets["test"].runtimeClasspath + classpath = testSourceSet.runtimeClasspath workingDir = rootDir } val cleanTestForWebDemo by tasks diff --git a/j2k/build.gradle.kts.173 b/j2k/build.gradle.kts.173 index 0ee52a39cdd..7a14b621ebd 100644 --- a/j2k/build.gradle.kts.173 +++ b/j2k/build.gradle.kts.173 @@ -58,7 +58,7 @@ testsJar() val testForWebDemo by task { include("**/*JavaToKotlinConverterForWebDemoTestGenerated*") - classpath = javaPluginConvention().sourceSets["test"].runtimeClasspath + classpath = testSourceSet.runtimeClasspath workingDir = rootDir } val cleanTestForWebDemo by tasks diff --git a/j2k/build.gradle.kts.as31 b/j2k/build.gradle.kts.as31 index db0dbdb2f55..660235d8102 100644 --- a/j2k/build.gradle.kts.as31 +++ b/j2k/build.gradle.kts.as31 @@ -59,7 +59,7 @@ testsJar() val testForWebDemo by task { include("**/*JavaToKotlinConverterForWebDemoTestGenerated*") - classpath = javaPluginConvention().sourceSets["test"].runtimeClasspath + classpath = testSourceSet.runtimeClasspath workingDir = rootDir } val cleanTestForWebDemo by tasks diff --git a/j2k/build.gradle.kts.as32 b/j2k/build.gradle.kts.as32 index 365d8db8f9c..d08b0ae4b3c 100644 --- a/j2k/build.gradle.kts.as32 +++ b/j2k/build.gradle.kts.as32 @@ -60,7 +60,7 @@ testsJar() val testForWebDemo by task { include("**/*JavaToKotlinConverterForWebDemoTestGenerated*") - classpath = javaPluginConvention().sourceSets["test"].runtimeClasspath + classpath = testSourceSet.runtimeClasspath workingDir = rootDir } val cleanTestForWebDemo by tasks diff --git a/libraries/kotlinx-metadata/jvm/build.gradle.kts b/libraries/kotlinx-metadata/jvm/build.gradle.kts index e867036c24c..6e5597bac11 100644 --- a/libraries/kotlinx-metadata/jvm/build.gradle.kts +++ b/libraries/kotlinx-metadata/jvm/build.gradle.kts @@ -49,7 +49,7 @@ val shadowJar = task("shadowJar") { callGroovy("manifestAttributes", manifest, project) manifest.attributes["Implementation-Version"] = version - from(javaPluginConvention().sourceSets["main"].output) + from(mainSourceSet.output) exclude("**/*.proto") configurations = listOf(shadows) diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index b6a8eb508c3..8a99a357858 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -127,11 +127,11 @@ val reflectShadowJar by task { 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/**") } diff --git a/libraries/tools/kotlinp/build.gradle.kts b/libraries/tools/kotlinp/build.gradle.kts index b793ff5dfe1..e1dcde861c6 100644 --- a/libraries/tools/kotlinp/build.gradle.kts +++ b/libraries/tools/kotlinp/build.gradle.kts @@ -32,7 +32,7 @@ val shadowJar by task { 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" } diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts index 62a932954f4..9c7d96c0f97 100644 --- a/prepare/compiler-client-embeddable/build.gradle.kts +++ b/prepare/compiler-client-embeddable/build.gradle.kts @@ -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) diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 299dc7924a7..859dbd402cd 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -37,7 +37,7 @@ val compilerModules: Array by rootProject.extra compilerModules.forEach { evaluationDependsOn(it) } val compiledModulesSources = compilerModules.map { - project(it).javaPluginConvention().sourceSets.getByName("main").allSource + project(it).mainSourceSet.allSource } dependencies { diff --git a/prepare/compiler/build.gradle.kts.173 b/prepare/compiler/build.gradle.kts.173 index 1b2f6c8d5bb..56171071a54 100644 --- a/prepare/compiler/build.gradle.kts.173 +++ b/prepare/compiler/build.gradle.kts.173 @@ -37,7 +37,7 @@ val compilerModules: Array by rootProject.extra compilerModules.forEach { evaluationDependsOn(it) } val compiledModulesSources = compilerModules.map { - project(it).javaPluginConvention().sourceSets.getByName("main").allSource + project(it).mainSourceSet.allSource } dependencies { diff --git a/prepare/compiler/build.gradle.kts.182 b/prepare/compiler/build.gradle.kts.182 index f1a385e15ba..de078b9f02b 100644 --- a/prepare/compiler/build.gradle.kts.182 +++ b/prepare/compiler/build.gradle.kts.182 @@ -37,7 +37,7 @@ val compilerModules: Array by rootProject.extra compilerModules.forEach { evaluationDependsOn(it) } val compiledModulesSources = compilerModules.map { - project(it).javaPluginConvention().sourceSets.getByName("main").allSource + project(it).mainSourceSet.allSource } dependencies { diff --git a/prepare/formatter/build.gradle.kts b/prepare/formatter/build.gradle.kts index 6202ec4655f..209dee085b7 100644 --- a/prepare/formatter/build.gradle.kts +++ b/prepare/formatter/build.gradle.kts @@ -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 diff --git a/prepare/ide-lazy-resolver/build.gradle.kts b/prepare/ide-lazy-resolver/build.gradle.kts index 4a521ae5f3f..102af4e3aad 100644 --- a/prepare/ide-lazy-resolver/build.gradle.kts +++ b/prepare/ide-lazy-resolver/build.gradle.kts @@ -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 diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index 16669c0ffbc..c61dc81295f 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -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")) { 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" } diff --git a/ultimate/build.gradle.kts.173 b/ultimate/build.gradle.kts.173 index 50f77254eba..21451894fb7 100644 --- a/ultimate/build.gradle.kts.173 +++ b/ultimate/build.gradle.kts.173 @@ -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")) { 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" } diff --git a/ultimate/build.gradle.kts.as31 b/ultimate/build.gradle.kts.as31 index 15f59b0f23f..e72cee4208d 100644 --- a/ultimate/build.gradle.kts.as31 +++ b/ultimate/build.gradle.kts.as31 @@ -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")) { 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" } diff --git a/ultimate/build.gradle.kts.as32 b/ultimate/build.gradle.kts.as32 index 55b3766f1c0..0f2e8af2dce 100644 --- a/ultimate/build.gradle.kts.as32 +++ b/ultimate/build.gradle.kts.as32 @@ -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")) { 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" }