From 93d7795bd9449a2c265c855b51dbcd4e45ad8f8c Mon Sep 17 00:00:00 2001 From: nik Date: Mon, 25 Mar 2019 14:11:26 +0300 Subject: [PATCH] java coverage: move coverage platform module from java coverage plugin JAR to IDEA's platform JAR This is required since registration of coverage components was moved to JavaIdePlugin.xml. --- .../jetbrains/intellij/build/CommunityRepositoryModules.groovy | 1 - .../intellij/build/impl/DistributionJARsBuilder.groovy | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy index bb37a6886869..218fb680ccf6 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy @@ -210,7 +210,6 @@ class CommunityRepositoryModules { withModule("intellij.eclipse.common") }, plugin("intellij.java.coverage") { - withModule("intellij.platform.coverage", mainJarName) withModule("intellij.java.coverage.rt") withProjectLibrary("JaCoCo") //todo[nik] convert to module library }, 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 e658caf0eb03..81cd2adf612d 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 @@ -129,7 +129,7 @@ class DistributionJARsBuilder { withModule("intellij.platform.jps.model.serialization", "jps-model.jar") withModule("intellij.platform.jps.model.impl", "jps-model.jar") - if (allProductDependencies.contains("intellij.platform.coverage") && !productLayout.bundledPluginModules.contains("intellij.java.coverage")) { + if (allProductDependencies.contains("intellij.platform.coverage")) { withModule("intellij.platform.coverage", productLayout.mainJarName) }