From 18feb3056937f0621c28bb8c3cf2b13022e3802b Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Thu, 26 May 2022 21:02:21 +0200 Subject: [PATCH] Introduce `kotlin-jps-plugin` and deprecate `kotlin-jps-plugin-classpath` `kotlin-jps-plugin-classpath` isn't dropped because, in some places, IDE depends on the old artifact so I want to keep it for a while until I cleanup IDE completely. I tried to put as much libraries into `kotlinJpsPluginMavenDependencies` as possible in the previous commit. Right now, `kotlin-jps-plugin-classpath` is 33Mb, `kotlin-jps-plugin` is 20Mb (all are not compresed) --- build.gradle.kts | 1 + .../kotlin-jps-plugin-classpath/build.gradle.kts | 1 + prepare/kotlin-jps-plugin/build.gradle.kts | 13 +++++++++++++ settings.gradle | 1 + 4 files changed, 16 insertions(+) create mode 100644 prepare/kotlin-jps-plugin/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index 2ef92eaa1cf..fc37320e945 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -319,6 +319,7 @@ extra["compilerArtifactsForIde"] = listOfNotNull( ":prepare:ide-plugin-dependencies:kotlin-compiler-common-for-ide", ":prepare:ide-plugin-dependencies:kotlin-compiler-fe10-for-ide", ":prepare:ide-plugin-dependencies:kotlin-compiler-fir-for-ide", + ":prepare:kotlin-jps-plugin", ":kotlin-script-runtime", ":kotlin-script-util", ":kotlin-scripting-common", 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 621b90689dd..03b5ef3a5cd 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 @@ -1,3 +1,4 @@ +// This artifact is deprecated and will be remove in the near future. Use `kotlin-jps-plugin` instead idePluginDependency { @Suppress("UNCHECKED_CAST") val embeddedDependencies = rootProject.extra["kotlinJpsPluginEmbeddedDependencies"] as List diff --git a/prepare/kotlin-jps-plugin/build.gradle.kts b/prepare/kotlin-jps-plugin/build.gradle.kts new file mode 100644 index 00000000000..d2a436066b6 --- /dev/null +++ b/prepare/kotlin-jps-plugin/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + `java-library` +} + +dependencies { + rootProject.extra["kotlinJpsPluginMavenDependencies"] + .let { it as List } + .forEach { implementation(project(it)) } +} + +@Suppress("UNCHECKED_CAST") +val embeddedDependencies = rootProject.extra["kotlinJpsPluginEmbeddedDependencies"] as List +publishProjectJars(embeddedDependencies + listOf(":jps:jps-plugin", ":jps:jps-common"), libraryDependencies = listOf(protobufFull())) diff --git a/settings.gradle b/settings.gradle index 8a66b006e72..3877a8b2f62 100644 --- a/settings.gradle +++ b/settings.gradle @@ -533,6 +533,7 @@ if (attachedIntellijVersion == "master") { include ":jps:jps-common", ":jps:jps-plugin", + ":prepare:kotlin-jps-plugin", ":jps:jps-platform-api-signatures" include ":generators:analysis-api-generator",