[Parcelize] Recombine for-ide libraries.
K2 IDE support requires that the entire plugin is in a single JAR, so we
need to have the K1, K2, and CLI (CompilerPluginRegistrar) libraries
available on a single for-ide target.
This reverts commit c9badd14a7f32e0094e017c7d30eb47b17fc85da.
^KT-57795 fixed
diff --git a/build.gradle.kts b/build.gradle.kts
index 8065f5a..60d9ebe1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -289,8 +289,6 @@
":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
deleted file mode 100644
index 4aea30c..0000000
--- a/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-fe10-for-ide/build.gradle.kts
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 26a9ca6..0000000
--- a/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-fir-for-ide/build.gradle.kts
+++ /dev/null
@@ -1,5 +0,0 @@
-plugins {
- kotlin("jvm")
-}
-
-publishJarsForIde(listOf(":plugins:parcelize:parcelize-compiler:parcelize.k2"))
diff --git a/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-for-ide/build.gradle.kts
index a0d0372..4c13b89 100644
--- a/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-for-ide/build.gradle.kts
@@ -4,9 +4,11 @@
publishJarsForIde(
listOf(
+ ":plugins:parcelize:parcelize-compiler:parcelize.backend",
+ ":plugins:parcelize:parcelize-compiler:parcelize.cli",
":plugins:parcelize:parcelize-compiler:parcelize.common",
":plugins:parcelize:parcelize-compiler:parcelize.k1",
- ":plugins:parcelize:parcelize-compiler:parcelize.backend",
+ ":plugins:parcelize:parcelize-compiler:parcelize.k2",
":plugins:parcelize:parcelize-runtime"
)
)
diff --git a/settings.gradle b/settings.gradle
index 2056231..80d9296 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -353,8 +353,6 @@
":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",
