From 19986e7f7dd1e259fa0d5938be1d4f77b0dad2a0 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Thu, 13 Jun 2019 09:18:44 +0300 Subject: [PATCH] ES: add `externalSystem.rt` jar to all IDEs distributions IDEA-187832 GitOrigin-RevId: 0f19e1651b826ebc6c905a080a9358cd5e0c230c --- .../org/jetbrains/intellij/build/BaseIdeaProperties.groovy | 1 - .../intellij/build/impl/DistributionJARsBuilder.groovy | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy index ad2092948e97..55bbfed774e3 100644 --- a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy +++ b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy @@ -103,7 +103,6 @@ abstract class BaseIdeaProperties extends ProductProperties { "intellij.java.jps.javacRefScanner8"]) productLayout.additionalPlatformJars.put("resources.jar", "intellij.java.ide.resources") - productLayout.additionalPlatformJars.put("external-system-rt.jar", "intellij.platform.externalSystem.rt") productLayout.platformLayoutCustomizer = { PlatformLayout layout -> layout.customize { diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy index cbc3eabb10d3..7a3c3cf46ac7 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy @@ -160,6 +160,8 @@ class DistributionJARsBuilder { withModule("intellij.platform.jps.model.serialization", "jps-model.jar") withModule("intellij.platform.jps.model.impl", "jps-model.jar") + withModule("intellij.platform.externalSystem.rt", "external-system-rt.jar") + if (allProductDependencies.contains("intellij.platform.coverage")) { withModule("intellij.platform.coverage", productLayout.mainJarName) }