From 6bbd0075600832a93b9b6068e150c97dec773ae4 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Fri, 27 May 2022 07:27:53 +0200 Subject: [PATCH] Refactoring: "suck in" `kotlin-reflect` and `kotlin-daemon-client` into `compilerModulesForJps` This commit places all dependencies of JPS plugin into a single place -- `compilerModulesForJps`. I will need this small refactoring for the next commits. This commit doesn't change any logic because `prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts` is the only `compilerModulesForJps` user right now. --- build.gradle.kts | 2 ++ .../kotlin-jps-plugin-classpath/build.gradle.kts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f13e816bd98..723e31905c8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -244,6 +244,8 @@ extra["compilerModules"] = extra["compilerModulesForJps"] = listOf( + ":kotlin-daemon-client", + ":kotlin-reflect", ":kotlin-build-common", ":kotlin-util-io", ":kotlin-util-klib", diff --git a/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts index 0bae8996764..3532f47e1bd 100644 --- a/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts +++ b/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts @@ -2,7 +2,7 @@ idePluginDependency { @Suppress("UNCHECKED_CAST") val compilerComponents = rootProject.extra["compilerModulesForJps"] as List - val otherProjects = listOf(":kotlin-daemon-client", ":jps:jps-plugin", ":jps:jps-common", ":kotlin-reflect") + val otherProjects = listOf(":jps:jps-plugin", ":jps:jps-common") publishProjectJars(compilerComponents + otherProjects, libraryDependencies = listOf(protobufFull())) }