From c9badd14a7f32e0094e017c7d30eb47b17fc85da Mon Sep 17 00:00:00 2001 From: Justin Paupore Date: Tue, 4 Apr 2023 15:50:15 -0700 Subject: [PATCH] Split Parcelize for-ide support by frontend. Create new targets for K1 and K2-specific jars for the IDE. (These contain the diagnostics classes generated by the plugins, used to target quickfixes.) The existing `parcelize-compiler-plugin-for-ide` target remains untouched with a K1 JAR dependency, because IJ currently depends on this. Once IJ is cleaned up, we can remove the K1 reference from that target, leaving only code shared between frontends. ^KT-57795 --- build.gradle.kts | 2 ++ .../parcelize-compiler-plugin-fe10-for-ide/build.gradle.kts | 5 +++++ .../parcelize-compiler-plugin-fir-for-ide/build.gradle.kts | 5 +++++ settings.gradle | 2 ++ 4 files changed, 14 insertions(+) create mode 100644 prepare/ide-plugin-dependencies/parcelize-compiler-plugin-fe10-for-ide/build.gradle.kts create mode 100644 prepare/ide-plugin-dependencies/parcelize-compiler-plugin-fir-for-ide/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index 7976ad4504e..53c3986799c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -286,6 +286,8 @@ extra["compilerArtifactsForIde"] = listOfNotNull( ":prepare:ide-plugin-dependencies:sam-with-receiver-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:assignment-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-fe10-for-ide", + ":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-fir-for-ide", ":prepare:ide-plugin-dependencies:lombok-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:kotlin-backend-native-for-ide".takeIf { kotlinBuildProperties.isKotlinNativeEnabled }, ":prepare:ide-plugin-dependencies:kotlin-compiler-tests-for-ide", diff --git a/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-fe10-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-fe10-for-ide/build.gradle.kts new file mode 100644 index 00000000000..4aea30c35dd --- /dev/null +++ b/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-fe10-for-ide/build.gradle.kts @@ -0,0 +1,5 @@ +plugins { + kotlin("jvm") +} + +publishJarsForIde(listOf(":plugins:parcelize:parcelize-compiler:parcelize.k1")) diff --git a/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-fir-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-fir-for-ide/build.gradle.kts new file mode 100644 index 00000000000..26a9ca69096 --- /dev/null +++ b/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-fir-for-ide/build.gradle.kts @@ -0,0 +1,5 @@ +plugins { + kotlin("jvm") +} + +publishJarsForIde(listOf(":plugins:parcelize:parcelize-compiler:parcelize.k2")) diff --git a/settings.gradle b/settings.gradle index 233d44c1011..ae32a0779c2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -351,6 +351,8 @@ if (!buildProperties.inJpsBuildIdeaSync) { ":prepare:ide-plugin-dependencies:sam-with-receiver-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:assignment-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-fe10-for-ide", + ":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-fir-for-ide", ":prepare:ide-plugin-dependencies:lombok-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:kotlin-backend-native-for-ide", ":prepare:ide-plugin-dependencies:tests-common-tests-for-ide",