diff --git a/jps/jps-common/build.gradle.kts b/jps/jps-common/build.gradle.kts index b65813762d8..ad19a564529 100644 --- a/jps/jps-common/build.gradle.kts +++ b/jps/jps-common/build.gradle.kts @@ -6,11 +6,10 @@ plugins { dependencies { implementation(kotlinStdlib()) - implementation(project(":compiler:util")) - implementation(project(":compiler:cli-common")) - implementation(project(":compiler:frontend.java")) - implementation(project(":js:js.frontend")) - implementation(project(":kotlin-reflect")) + rootProject.extra["compilerModulesForJps"] + .let { it as List } + .forEach { implementation(project(it)) } + compileOnly(intellijUtilRt()) compileOnly(intellijPlatformUtil()) compileOnly(jpsModel()) diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts index 01f6a0f0c06..f35128fe3d7 100644 --- a/jps/jps-plugin/build.gradle.kts +++ b/jps/jps-plugin/build.gradle.kts @@ -15,18 +15,13 @@ val generateTests by generator("org.jetbrains.kotlin.jps.GenerateJpsPluginTestsK } dependencies { - implementation(project(":kotlin-build-common")) - implementation(project(":core:descriptors")) - implementation(project(":core:descriptors.jvm")) - implementation(project(":kotlin-compiler-runner-unshaded")) - implementation(project(":daemon-common")) - implementation(project(":daemon-common-new")) - implementation(project(":kotlin-daemon-client")) compileOnly(project(":jps:jps-platform-api-signatures")) testImplementation(projectTests(":generators:test-generator")) - implementation(project(":compiler:frontend.java")) - implementation(project(":js:js.frontend")) - implementation(project(":kotlin-preloader")) + + rootProject.extra["compilerModulesForJps"] + .let { it as List } + .forEach { implementation(project(it)) } + implementation(project(":jps:jps-common")) compileOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil")) compileOnly(jpsModel())