From f1bfb45c2eee4af3e53d8b0fa50967a8cca7dc7a Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 9 Apr 2025 19:09:10 +0200
Subject: [PATCH] LibraryPackMode.STANDALONE_MERGED is a default mode now

GitOrigin-RevId: 4b3bd850b2609b2bdad72789047e9289ec58648c
---
 .../jetbrains/intellij/build/kotlin/KotlinPluginBuilder.kt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.kt
index c53dc481c92a..455aea042f52 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.kt
@@ -11,7 +11,6 @@ import org.jetbrains.intellij.build.ProductProperties
 import org.jetbrains.intellij.build.createBuildTasks
 import org.jetbrains.intellij.build.impl.BuildContextImpl
 import org.jetbrains.intellij.build.impl.BuildUtils.checkedReplace
-import org.jetbrains.intellij.build.impl.LibraryPackMode
 import org.jetbrains.intellij.build.impl.PluginLayout
 import org.jetbrains.intellij.build.impl.PluginVersionEvaluator
 import org.jetbrains.intellij.build.impl.PluginVersionEvaluatorResult
@@ -298,7 +297,7 @@ object KotlinPluginBuilder {
       }
 
       for (library in COMPILER_PLUGINS) {
-        spec.withProjectLibrary(library, LibraryPackMode.STANDALONE_MERGED)
+        spec.withProjectLibrary(library)
       }
 
       if (ultimateSources == KotlinUltimateSources.WITH_ULTIMATE_MODULES) {
@@ -427,7 +426,7 @@ object KotlinPluginBuilder {
   fun kotlinFrontendPlugin(): PluginLayout {
     return PluginLayout.plugin(MAIN_FRONTEND_MODULE_NAME) { spec ->
       spec.withModules(MODULES_SHARED_WITH_CLIENT)
-      spec.withProjectLibrary("kotlinc.kotlin-compiler-common", LibraryPackMode.STANDALONE_MERGED)
+      spec.withProjectLibrary("kotlinc.kotlin-compiler-common")
     }
   }
 
@@ -452,7 +451,7 @@ object KotlinPluginBuilder {
 
 private fun withKotlincKotlinCompilerCommonLibrary(spec: PluginLayout.PluginLayoutSpec, mainPluginModule: String) {
   val kotlincKotlinCompilerCommon = "kotlinc.kotlin-compiler-common"
-  spec.withProjectLibrary(kotlincKotlinCompilerCommon, LibraryPackMode.STANDALONE_MERGED)
+  spec.withProjectLibrary(kotlincKotlinCompilerCommon)
 
   spec.withPatch { patcher, context ->
     val library = context.project.libraryCollection.findLibrary(kotlincKotlinCompilerCommon)!!