Move compilerComponents project list to the root project

This commit is contained in:
Yan Zhulanow
2020-05-07 20:24:20 +09:00
parent 9d1c405b3c
commit fb8640b3b6
4 changed files with 30 additions and 29 deletions

View File

@@ -279,6 +279,28 @@ extra["compilerModules"] = arrayOf(
":compiler:fir:analysis-tests"
)
extra["compilerModulesForJps"] = listOf(
":core:type-system",
":kotlin-build-common",
":kotlin-util-io",
":kotlin-util-klib",
":kotlin-util-klib-metadata",
":compiler:cli-common",
":kotlin-compiler-runner",
":daemon-common",
":daemon-common-new",
":core:descriptors",
":core:descriptors.jvm",
":idea:idea-jps-common",
":kotlin-preloader",
":compiler:util",
":compiler:config",
":compiler:config.jvm",
":js:js.config",
":core:util.runtime",
":compiler:compiler.version"
)
val coreLibProjects = listOfNotNull(
":kotlin-stdlib",
":kotlin-stdlib-common",

View File

@@ -1,8 +1,8 @@
idePluginDependency {
@Suppress("UNCHECKED_CAST")
val compilerComponentProjects = project(":kotlin-jps-plugin").extra["compilerComponents"] as List<String>
val compilerComponents = rootProject.extra["compilerModulesForJps"] as List<String>
val otherProjects = listOf(":kotlin-daemon-client")
publishProjectJars(compilerComponentProjects + otherProjects)
publishProjectJars(compilerComponents + otherProjects)
}

View File

@@ -8,10 +8,11 @@ idePluginDependency {
val jar: Jar by tasks
jar.apply {
val distKotlincTask = project(":kotlin-compiler").tasks.getByName("distKotlinc")
dependsOn(distKotlincTask)
from(distKotlincTask)
dependsOn(":kotlin-compiler:distKotlinc")
// from {
// val distKotlincTask = project(":kotlin-compiler").tasks.getByName("distKotlinc")
// (distKotlincTask)
// }
}

View File

@@ -4,29 +4,7 @@ plugins {
java
}
val compilerComponents by extra(
listOf(
":core:type-system",
":kotlin-build-common",
":kotlin-util-io",
":kotlin-util-klib",
":kotlin-util-klib-metadata",
":compiler:cli-common",
":kotlin-compiler-runner",
":daemon-common",
":daemon-common-new",
":core:descriptors",
":core:descriptors.jvm",
":idea:idea-jps-common",
":kotlin-preloader",
":compiler:util",
":compiler:config",
":compiler:config.jvm",
":js:js.config",
":core:util.runtime",
":compiler:compiler.version"
)
)
val compilerComponents = rootProject.extra["compilerModulesForJps"] as List<String>
val projectsToShadow = compilerComponents + listOf(":jps-plugin")