[gradle] IDEA-357140 Migrate Gradle Java Plugin descriptors to V2: coverage module

GitOrigin-RevId: 6cbacc1a4942402c5b92f3390b02ba5f7dbdd28a
2026-03-22 15:19:59 +07:00 · 2026-02-12 14:33:41 +01:00
parent cacb6c5f18
commit 1fc3e7440c
11 changed files with 65 additions and 25 deletions
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -459,6 +459,7 @@
      <module fileurl="file://$PROJECT_DIR$/plugins/gradle/gradle-declarative-sync/intellij.gradle.declarativeSync.tests.iml" filepath="$PROJECT_DIR$/plugins/gradle/gradle-declarative-sync/intellij.gradle.declarativeSync.tests.iml" />
      <module fileurl="file://$PROJECT_DIR$/plugins/gradle/gradle-dependency-updater/intellij.gradle.dependencyUpdater.iml" filepath="$PROJECT_DIR$/plugins/gradle/gradle-dependency-updater/intellij.gradle.dependencyUpdater.iml" />
      <module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/intellij.gradle.java.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/intellij.gradle.java.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/coverage/intellij.gradle.java.coverage.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/coverage/intellij.gradle.java.coverage.iml" />
      <module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/groovy/intellij.gradle.java.groovy.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/groovy/intellij.gradle.java.groovy.iml" />
      <module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/groovy/ml/intellij.gradle.java.groovy.ml.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/groovy/ml/intellij.gradle.java.groovy.ml.iml" />
      <module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/groovy/toml/intellij.gradle.java.groovy.toml.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/groovy/toml/intellij.gradle.java.groovy.toml.iml" />
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -997,6 +997,7 @@ plugins/gradle/gradle-declarative-sync
 plugins/gradle/gradle-dependency-updater
 plugins/gradle/intellij.gradle.analysis
 plugins/gradle/java
+plugins/gradle/java/coverage
 plugins/gradle/java/groovy
 plugins/gradle/java/groovy/ml
 plugins/gradle/java/groovy/toml
--- a/plugins/gradle/java/BUILD.bazel
+++ b/plugins/gradle/java/BUILD.bazel
@@ -18,7 +18,6 @@ jvm_library(
    "//plugins/gradle",
    "//plugins/gradle/plugin",
    "//plugins/gradle:gradle-common",
-    "//plugins/coverage",
    "//plugins/gradle/jps-plugin:jps",
    "//java/java-indexing-api:indexing",
    "//platform/analysis-api:analysis",
--- a/plugins/gradle/java/coverage/BUILD.bazel
+++ b/plugins/gradle/java/coverage/BUILD.bazel
@@ -0,0 +1,26 @@
+### auto-generated section `build intellij.gradle.java.coverage` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "coverage_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "coverage",
+  module_name = "intellij.gradle.java.coverage",
+  visibility = ["//visibility:public"],
+  srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
+  resources = [":coverage_resources"],
+  deps = [
+    "@lib//:kotlin-stdlib",
+    "@lib//:jetbrains-annotations",
+    "//platform/external-system-impl:externalSystem-impl",
+    "//platform/execution",
+    "//platform/smRunner",
+    "//plugins/gradle",
+    "//plugins/coverage",
+  ]
+)
+### auto-generated section `build intellij.gradle.java.coverage` end
--- a/plugins/gradle/java/coverage/intellij.gradle.java.coverage.iml
+++ b/plugins/gradle/java/coverage/intellij.gradle.java.coverage.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="com.intellij.gradle.java.coverage" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="library" name="jetbrains-annotations" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" />
+    <orderEntry type="module" module-name="intellij.platform.execution" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
+    <orderEntry type="module" module-name="intellij.gradle" />
+    <orderEntry type="module" module-name="intellij.java.coverage" />
+  </component>
+</module>
--- a/plugins/gradle/java/coverage/resources/intellij.gradle.java.coverage.xml
+++ b/plugins/gradle/java/coverage/resources/intellij.gradle.java.coverage.xml
@@ -0,0 +1,5 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="com.intellij">
+    <javaCoverageEngineExtension implementation="com.intellij.gradle.java.coverage.GradleCoverageExtension"/>
+  </extensions>
+</idea-plugin>
--- a/plugins/gradle/java/coverage/src/GradleCoverageExtension.kt
+++ b/plugins/gradle/java/coverage/src/GradleCoverageExtension.kt
@@ -0,0 +1,12 @@
+// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.gradle.java.coverage
+
+import com.intellij.coverage.JavaCoverageEngineExtension
+import com.intellij.execution.configurations.RunConfigurationBase
+import org.jetbrains.plugins.gradle.service.execution.GradleRunConfiguration
+
+class GradleCoverageExtension: JavaCoverageEngineExtension() {
+  override fun isApplicableTo(conf: RunConfigurationBase<*>?): Boolean = conf is GradleRunConfiguration &&
+                                                                                !conf.isCoverageDisabled
+
+}
--- a/plugins/gradle/java/intellij.gradle.java.iml
+++ b/plugins/gradle/java/intellij.gradle.java.iml
@@ -13,7 +13,6 @@
    <orderEntry type="module" module-name="intellij.gradle" />
    <orderEntry type="module" module-name="intellij.gradle.plugin" />
    <orderEntry type="module" module-name="intellij.gradle.common" exported="" />
-    <orderEntry type="module" module-name="intellij.java.coverage" />
    <orderEntry type="module" module-name="intellij.gradle.jps" />
    <orderEntry type="module" module-name="intellij.java.indexing" />
    <orderEntry type="module" module-name="intellij.platform.analysis" />
--- a/plugins/gradle/java/resources/META-INF/gradle-coverage-integration.xml
+++ b/plugins/gradle/java/resources/META-INF/gradle-coverage-integration.xml
@@ -1,5 +0,0 @@
-<idea-plugin>
-  <extensions defaultExtensionNs="com.intellij">
-    <javaCoverageEngineExtension implementation="org.jetbrains.plugins.gradle.execution.test.runner.GradleCoverageExtension"/>
-  </extensions>
-</idea-plugin>
--- a/plugins/gradle/java/resources/META-INF/plugin.xml
+++ b/plugins/gradle/java/resources/META-INF/plugin.xml
@@ -18,7 +18,6 @@
  <module value="org.jetbrains.plugins.gradle.java"/>

  <depends optional="true" config-file="gradle-maven-integration.xml">org.jetbrains.idea.maven</depends>
-  <depends optional="true" config-file="gradle-coverage-integration.xml">Coverage</depends>
  <depends optional="true" config-file="gradle-groovy-integration.xml">org.intellij.groovy</depends>
  <depends optional="true" config-file="gradle-properties-integration.xml">com.intellij.properties</depends>

@@ -32,6 +31,7 @@
    <module name="intellij.gradle.java.groovy"/>
    <module name="intellij.gradle.java.groovy.toml"/>
    <module name="intellij.gradle.java.groovy.ml"/>
+    <module name="intellij.gradle.java.coverage"/>
  </content>

  <resource-bundle>messages.GradleInspectionBundle</resource-bundle>
--- a/plugins/gradle/java/src/execution/test/runner/GradleCoverageExtension.kt
+++ b/plugins/gradle/java/src/execution/test/runner/GradleCoverageExtension.kt
@@ -1,17 +0,0 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.plugins.gradle.execution.test.runner
-
-import com.intellij.coverage.JavaCoverageEngineExtension
-import com.intellij.execution.configurations.RunConfigurationBase
-import org.jetbrains.plugins.gradle.service.execution.GradleRunConfiguration
-
-/**
- * Created by Nikita.Skvortsov
- * date: 23.08.2017.
- */
-
-class GradleCoverageExtension: JavaCoverageEngineExtension() {
-  override fun isApplicableTo(conf: RunConfigurationBase<*>?) = conf is GradleRunConfiguration &&
-                                                                !conf.isCoverageDisabled
-
-}