From 636ca7c43565f378cbb6b701de853b183f747b8c Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Thu, 29 Aug 2024 07:57:22 +0200 Subject: [PATCH] IJPL-158930 don't merge `kotlinx-coroutines-slf4j` into `app.jar` Fleet modules depend on it, and they are used in the frontend process, which results in the whole `app.jar` added to the frontend classpath without this change. GitOrigin-RevId: 02cdf11eecf32689ffc5b5e2875b4653cbab4640 --- .../src/org/jetbrains/intellij/build/impl/PlatformModules.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt index 940df50c6f8a..1c14ed2d74ed 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt @@ -12,7 +12,6 @@ import kotlinx.coroutines.withContext import org.jdom.CDATA import org.jdom.Element import org.jetbrains.intellij.build.* -import org.jetbrains.intellij.build.impl.PlatformJarNames.APP_JAR import org.jetbrains.intellij.build.impl.PlatformJarNames.PRODUCT_CLIENT_JAR import org.jetbrains.intellij.build.impl.PlatformJarNames.PRODUCT_JAR import org.jetbrains.intellij.build.impl.PlatformJarNames.TEST_FRAMEWORK_JAR @@ -163,7 +162,7 @@ internal suspend fun createPlatformLayout(projectLibrariesUsedByPlugins: SortedS layout.withProjectLibrary(libraryName = "aalto-xml", jarName = UTIL_8_JAR) // Space plugin uses it and bundles into IntelliJ IDEA, but not bundles into DataGrip, so, or Space plugin should bundle this lib, // or IJ Platform. As it is a small library and consistency is important across other coroutine libs, bundle to IJ Platform. - layout.withProjectLibrary(libraryName = "kotlinx-coroutines-slf4j", jarName = APP_JAR) + layout.withProjectLibrary(libraryName = "kotlinx-coroutines-slf4j", LibraryPackMode.STANDALONE_SEPARATE_WITHOUT_VERSION_NAME) // https://jetbrains.team/p/ij/reviews/67104/timeline // https://youtrack.jetbrains.com/issue/IDEA-179784