diff --git a/build.gradle.kts b/build.gradle.kts index 7d6c7989adb..f9750e4b39d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -347,7 +347,7 @@ allprojects { fun FileCollection.printClassPath(role: String) = println("${project.path} $role classpath:\n ${joinToString("\n ") { it.toProjectRootRelativePathOrSelf() } }") - try { the() } catch (_: UnknownDomainObjectException) { null }?.let { javaConvention -> + try { javaPluginConvention() } catch (_: UnknownDomainObjectException) { null }?.let { javaConvention -> task("printCompileClasspath") { doFirst { javaConvention.sourceSets["main"].compileClasspath.printClassPath("compile") } } task("printRuntimeClasspath") { doFirst { javaConvention.sourceSets["main"].runtimeClasspath.printClassPath("runtime") } } task("printTestCompileClasspath") { doFirst { javaConvention.sourceSets["test"].compileClasspath.printClassPath("test compile") } } diff --git a/build.gradle.kts.182 b/build.gradle.kts.182 index 3359c210f9b..e52e185b070 100644 --- a/build.gradle.kts.182 +++ b/build.gradle.kts.182 @@ -346,7 +346,7 @@ allprojects { fun FileCollection.printClassPath(role: String) = println("${project.path} $role classpath:\n ${joinToString("\n ") { it.toProjectRootRelativePathOrSelf() } }") - try { the() } catch (_: UnknownDomainObjectException) { null }?.let { javaConvention -> + try { javaPluginConvention() } catch (_: UnknownDomainObjectException) { null }?.let { javaConvention -> task("printCompileClasspath") { doFirst { javaConvention.sourceSets["main"].compileClasspath.printClassPath("compile") } } task("printRuntimeClasspath") { doFirst { javaConvention.sourceSets["main"].runtimeClasspath.printClassPath("runtime") } } task("printTestCompileClasspath") { doFirst { javaConvention.sourceSets["test"].compileClasspath.printClassPath("test compile") } } diff --git a/buildSrc/src/main/kotlin/CommonUtil.kt b/buildSrc/src/main/kotlin/CommonUtil.kt index 44a6c2607ec..63dc9d3e720 100644 --- a/buildSrc/src/main/kotlin/CommonUtil.kt +++ b/buildSrc/src/main/kotlin/CommonUtil.kt @@ -31,15 +31,15 @@ inline fun Project.withJavaPlugin(crossinline body: () -> T?): T? { } fun Project.getCompiledClasses(): SourceSetOutput? = withJavaPlugin { - the().sourceSets.getByName("main").output + javaPluginConvention().sourceSets.getByName("main").output } fun Project.getSources(): SourceDirectorySet? = withJavaPlugin { - the().sourceSets.getByName("main").allSource + javaPluginConvention().sourceSets.getByName("main").allSource } fun Project.getResourceFiles(): SourceDirectorySet? = withJavaPlugin { - the().sourceSets.getByName("main").resources + javaPluginConvention().sourceSets.getByName("main").resources } fun File(root: File, vararg children: String): File = children.fold(root, { f, c -> File(f, c) }) @@ -54,7 +54,7 @@ var Project.javaHome: String? set(v) { extra["javaHome"] = v } fun Project.generator(fqName: String, sourceSet: SourceSet? = null) = smartJavaExec { - classpath = (sourceSet ?: the().sourceSets["test"]).runtimeClasspath + classpath = (sourceSet ?: javaPluginConvention().sourceSets["test"]).runtimeClasspath main = fqName workingDir = rootDir } @@ -66,3 +66,5 @@ fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name) } inline fun CopySourceSpec.from(crossinline filesProvider: () -> Any?): CopySourceSpec = from(Callable { filesProvider() }) + +fun Project.javaPluginConvention(): JavaPluginConvention = the() diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt index 973ab977a18..d120f241632 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 = the().sourceSets["main"].output.classesDirs + val classesDirs = javaPluginConvention().sourceSets["main"].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.the().sourceSets.getByName("test").output) + from(project.javaPluginConvention().sourceSets.getByName("test").output) } classifier = "tests" body() @@ -88,7 +88,7 @@ fun Project.sourcesJar(sourceSet: String? = "main", body: Jar.() -> Unit = {}): try { if (sourceSet != null) { project.pluginManager.withPlugin("java-base") { - from(project.the().sourceSets[sourceSet].allSource) + from(project.javaPluginConvention().sourceSets[sourceSet].allSource) } } } catch (e: UnknownDomainObjectException) { diff --git a/buildSrc/src/main/kotlin/instrument.kt b/buildSrc/src/main/kotlin/instrument.kt index a26315e5529..d19e9fe721c 100644 --- a/buildSrc/src/main/kotlin/instrument.kt +++ b/buildSrc/src/main/kotlin/instrument.kt @@ -45,7 +45,7 @@ fun Project.configureInstrumentation() { // classes from the "friendly directory" to the compile classpath. val testCompile = tasks.findByName("compileTestKotlin") as AbstractCompile? testCompile?.doFirst { - val mainSourceSet = the().sourceSets.getByName("main") + val mainSourceSet = javaPluginConvention().sourceSets.getByName("main") testCompile.classpath = (testCompile.classpath - mainSourceSet.output.classesDirs + files((mainSourceSet as ExtensionAware).extra.get("classesDirsCopy"))) @@ -59,7 +59,7 @@ fun Project.configureInstrumentation() { } afterEvaluate { - the().sourceSets.all { sourceSetParam -> + javaPluginConvention().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 +150,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.the().sourceSets.getByName("main").allSource.sourceDirectories } + .map { p -> p.dependencyProject.javaPluginConvention().sourceSets.getByName("main").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 0663d6b01ac..a365ae19ef1 100644 --- a/buildSrc/src/main/kotlin/instrument.kt.182 +++ b/buildSrc/src/main/kotlin/instrument.kt.182 @@ -45,7 +45,7 @@ fun Project.configureInstrumentation() { // classes from the "friendly directory" to the compile classpath. val testCompile = tasks.findByName("compileTestKotlin") as AbstractCompile? testCompile?.doFirst { - val mainSourceSet = the().sourceSets.getByName("main") + val mainSourceSet = javaPluginConvention().sourceSets.getByName("main") testCompile.classpath = (testCompile.classpath - mainSourceSet.output.classesDirs + files((mainSourceSet as ExtensionAware).extra.get("classesDirsCopy"))) @@ -59,7 +59,7 @@ fun Project.configureInstrumentation() { } afterEvaluate { - the().sourceSets.all { sourceSetParam -> + javaPluginConvention().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 +150,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.the().sourceSets.getByName("main").allSource.sourceDirectories } + .map { p -> p.dependencyProject.javaPluginConvention().sourceSets.getByName("main").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 bf03375bb04..3ad1e99b742 100644 --- a/buildSrc/src/main/kotlin/intellijDependencies.kt +++ b/buildSrc/src/main/kotlin/intellijDependencies.kt @@ -118,7 +118,7 @@ fun Project.runIdeTask(name: String, ideaPluginDir: File, ideaSandboxDir: File, return task(name) { val ideaSandboxConfigDir = File(ideaSandboxDir, "config") - classpath = the().sourceSets["main"].runtimeClasspath + classpath = javaPluginConvention().sourceSets["main"].runtimeClasspath main = "com.intellij.idea.Main" diff --git a/buildSrc/src/main/kotlin/sourceSets.kt b/buildSrc/src/main/kotlin/sourceSets.kt index 8468f60961f..bae2d592653 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.the().sourceSets.maybeCreate(sourceSetName).apply { + return project.javaPluginConvention().sourceSets.maybeCreate(sourceSetName).apply { none() body() } @@ -52,7 +52,7 @@ fun SourceSet.projectDefault() { fun Project.getSourceSetsFrom(projectPath: String): SourceSetContainer { evaluationDependsOn(projectPath) - return project(projectPath).the().sourceSets + return project(projectPath).javaPluginConvention().sourceSets } diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index 8f373894e04..71f3fdae9f5 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -72,7 +72,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", the().sourceSets.getByName("test").output.classesDirs.asPath) + environment("PROJECT_CLASSES_DIRS", javaPluginConvention().sourceSets.getByName("test").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 6e5bda75c96..32096ec8d91 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", the().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator)) + systemProperty("kotlin.test.script.classpath", javaPluginConvention().sourceSets.getByName("test").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 f5edf980641..6d198cf7f8a 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(the().sourceSets.getByName("main").output) + from(javaPluginConvention().sourceSets.getByName("main").output) fromEmbeddedComponents() } diff --git a/compiler/daemon/daemon-client/build.gradle.kts.173 b/compiler/daemon/daemon-client/build.gradle.kts.173 index 903e83a2edb..b91373722ef 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(the().sourceSets.getByName("main").output) + from(javaPluginConvention().sourceSets.getByName("main").output) fromEmbeddedComponents() } diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts index acce4ecdc42..e4e9c2aa321 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", the().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator)) + systemProperty("kotlin.test.script.classpath", javaPluginConvention().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator)) systemProperty("idea.home.path", intellijRootDir().canonicalPath) } diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index 23ef9f7448f..46c51900536 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -9,7 +9,7 @@ sourceSets { "test" { projectDefault() } } -val builtinsSourceSet = the().sourceSets.create("builtins") { +val builtinsSourceSet = javaPluginConvention().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 858194a70b9..ec3923277a7 100644 --- a/generators/build.gradle.kts.as31 +++ b/generators/build.gradle.kts.as31 @@ -9,7 +9,7 @@ sourceSets { "test" { projectDefault() } } -val builtinsSourceSet = the().sourceSets.create("builtins") { +val builtinsSourceSet = javaPluginConvention().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 1bf783035b2..e46a50a5f45 100644 --- a/generators/build.gradle.kts.as32 +++ b/generators/build.gradle.kts.as32 @@ -9,7 +9,7 @@ sourceSets { "test" { projectDefault() } } -val builtinsSourceSet = the().sourceSets.create("builtins") { +val builtinsSourceSet = javaPluginConvention().sourceSets.create("builtins") { java.srcDir("builtins") } val builtinsCompile by configurations diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index fc63ba1ac0a..14b6a345ca2 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -128,7 +128,7 @@ val performanceTestRuntime by configurations.creating { } val performanceTest by run { - val sourceSets = the().sourceSets + 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 96eb4e99cdd..fb7525cc1a5 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -60,7 +60,7 @@ testsJar() val testForWebDemo by task { include("**/*JavaToKotlinConverterForWebDemoTestGenerated*") - classpath = the().sourceSets["test"].runtimeClasspath + classpath = javaPluginConvention().sourceSets["test"].runtimeClasspath workingDir = rootDir } val cleanTestForWebDemo by tasks diff --git a/j2k/build.gradle.kts.173 b/j2k/build.gradle.kts.173 index b2f3350e406..0ee52a39cdd 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 = the().sourceSets["test"].runtimeClasspath + classpath = javaPluginConvention().sourceSets["test"].runtimeClasspath workingDir = rootDir } val cleanTestForWebDemo by tasks diff --git a/j2k/build.gradle.kts.as31 b/j2k/build.gradle.kts.as31 index cf9d487e591..db0dbdb2f55 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 = the().sourceSets["test"].runtimeClasspath + classpath = javaPluginConvention().sourceSets["test"].runtimeClasspath workingDir = rootDir } val cleanTestForWebDemo by tasks diff --git a/j2k/build.gradle.kts.as32 b/j2k/build.gradle.kts.as32 index 97f63488432..365d8db8f9c 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 = the().sourceSets["test"].runtimeClasspath + classpath = javaPluginConvention().sourceSets["test"].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 f308be26fff..e867036c24c 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(the().sourceSets["main"].output) + from(javaPluginConvention().sourceSets["main"].output) exclude("**/*.proto") configurations = listOf(shadows) diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index 365a96f7aea..6e43ad2237c 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -131,11 +131,11 @@ val reflectShadowJar by task { version = null callGroovy("manifestAttributes", manifest, project, "Main", true) - from(the().sourceSets.getByName("main").output) - from(project(":core:descriptors.jvm").the().sourceSets.getByName("main").resources) { + from(javaPluginConvention().sourceSets.getByName("main").output) + from(project(":core:descriptors.jvm").javaPluginConvention().sourceSets.getByName("main").resources) { include("META-INF/services/**") } - from(project(":core:deserialization").the().sourceSets.getByName("main").resources) { + from(project(":core:deserialization").javaPluginConvention().sourceSets.getByName("main").resources) { include("META-INF/services/**") } diff --git a/libraries/tools/kotlinp/build.gradle.kts b/libraries/tools/kotlinp/build.gradle.kts index 51e96ee2b23..b793ff5dfe1 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(the().sourceSets.getByName("main").output) + from(javaPluginConvention().sourceSets.getByName("main").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 b1b56f0a5ea..62a932954f4 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", the().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator)) + systemProperty("kotlin.test.script.classpath", javaPluginConvention().sourceSets.getByName("test").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 4cd4e24d76c..fb6c3e43837 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).the().sourceSets.getByName("main").allSource + project(it).javaPluginConvention().sourceSets.getByName("main").allSource } dependencies { diff --git a/prepare/compiler/build.gradle.kts.173 b/prepare/compiler/build.gradle.kts.173 index c86dc575fa0..b15609a280a 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).the().sourceSets.getByName("main").allSource + project(it).javaPluginConvention().sourceSets.getByName("main").allSource } dependencies { diff --git a/prepare/compiler/build.gradle.kts.182 b/prepare/compiler/build.gradle.kts.182 index 78e2058f7ea..3772ee7e54d 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).the().sourceSets.getByName("main").allSource + project(it).javaPluginConvention().sourceSets.getByName("main").allSource } dependencies { diff --git a/prepare/formatter/build.gradle.kts b/prepare/formatter/build.gradle.kts index 8e2934f913d..6202ec4655f 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.the().sourceSets.getByName("main").output) + from(p.javaPluginConvention().sourceSets.getByName("main").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 d0d6e058f19..4a521ae5f3f 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.the().sourceSets.getByName("main").output) + from(p.javaPluginConvention().sourceSets.getByName("main").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 c49d5324a0e..16669c0ffbc 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -8,7 +8,7 @@ plugins { kotlin("jvm") } -val ideaProjectResources = project(":idea").the().sourceSets["main"].output.resourcesDir +val ideaProjectResources = project(":idea").javaPluginConvention().sourceSets["main"].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(the().sourceSets.getByName("main").output) + from(javaPluginConvention().sourceSets.getByName("main").output) archiveName = "kotlin-plugin.jar" } diff --git a/ultimate/build.gradle.kts.173 b/ultimate/build.gradle.kts.173 index 157de847646..50f77254eba 100644 --- a/ultimate/build.gradle.kts.173 +++ b/ultimate/build.gradle.kts.173 @@ -8,7 +8,7 @@ plugins { kotlin("jvm") } -val ideaProjectResources = project(":idea").the().sourceSets["main"].output.resourcesDir +val ideaProjectResources = project(":idea").javaPluginConvention().sourceSets["main"].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(the().sourceSets.getByName("main").output) + from(javaPluginConvention().sourceSets.getByName("main").output) archiveName = "kotlin-plugin.jar" } diff --git a/ultimate/build.gradle.kts.as31 b/ultimate/build.gradle.kts.as31 index 122b76f48ac..15f59b0f23f 100644 --- a/ultimate/build.gradle.kts.as31 +++ b/ultimate/build.gradle.kts.as31 @@ -10,7 +10,7 @@ plugins { kotlin("jvm") } -val ideaProjectResources = project(":idea").the().sourceSets["main"].output.resourcesDir +val ideaProjectResources = project(":idea").javaPluginConvention().sourceSets["main"].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(the().sourceSets.getByName("main").output) + from(javaPluginConvention().sourceSets.getByName("main").output) archiveName = "kotlin-plugin.jar" } diff --git a/ultimate/build.gradle.kts.as32 b/ultimate/build.gradle.kts.as32 index f330b5e05e6..55b3766f1c0 100644 --- a/ultimate/build.gradle.kts.as32 +++ b/ultimate/build.gradle.kts.as32 @@ -10,7 +10,7 @@ plugins { kotlin("jvm") } -val ideaProjectResources = project(":idea").the().sourceSets["main"].output.resourcesDir +val ideaProjectResources = project(":idea").javaPluginConvention().sourceSets["main"].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(the().sourceSets.getByName("main").output) + from(javaPluginConvention().sourceSets.getByName("main").output) archiveName = "kotlin-plugin.jar" }