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

GitOrigin-RevId: a06b3fa9db020288336ea31ec1817653bcdf3deb
This commit is contained in:
Dmitry Kichinsky
2026-02-16 14:59:39 +00:00
committed by intellij-monorepo-bot
parent 36eea1f4c9
commit 9225dc896a
28 changed files with 140 additions and 82 deletions
+1
View File
@@ -468,6 +468,7 @@
<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" />
<module fileurl="file://$PROJECT_DIR$/plugins/gradle-maven/intellij.gradle.java.maven.iml" filepath="$PROJECT_DIR$/plugins/gradle-maven/intellij.gradle.java.maven.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/performance/intellij.gradle.java.performance.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/performance/intellij.gradle.java.performance.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/plugin/intellij.gradle.java.plugin.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/plugin/intellij.gradle.java.plugin.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/properties/intellij.gradle.java.properties.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/properties/intellij.gradle.java.properties.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/intellij.gradle.java.tests.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/intellij.gradle.java.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/toml/intellij.gradle.java.toml.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/toml/intellij.gradle.java.toml.iml" />
+1
View File
@@ -1005,6 +1005,7 @@ plugins/gradle/java/groovy
plugins/gradle/java/groovy/ml
plugins/gradle/java/groovy/toml
plugins/gradle/java/performance
plugins/gradle/java/plugin
plugins/gradle/java/properties
plugins/gradle/java/toml
plugins/gradle/jps-plugin
@@ -29,7 +29,7 @@ val IDEA_BUNDLED_PLUGINS: PersistentList<String> = DEFAULT_BUNDLED_PLUGINS + per
"intellij.gradle.plugin",
"intellij.android.gradle.declarative.lang.ide",
"intellij.android.gradle.dsl",
"intellij.gradle.java",
"intellij.gradle.java.plugin",
"intellij.vcs.git",
"intellij.vcs.git.commit.modal",
"intellij.vcs.github",
@@ -184,7 +184,7 @@ object CommunityRepositoryModules {
spec.withProjectLibrary("Gradle", LibraryPackMode.STANDALONE_SEPARATE)
spec.withProjectLibrary("Ant", "ant", LibraryPackMode.STANDALONE_SEPARATE)
},
pluginAuto(listOf("intellij.gradle.java", "intellij.gradle.jps")) {
pluginAuto(listOf("intellij.gradle.java.plugin", "intellij.gradle.java", "intellij.gradle.jps")) {
it.excludeProjectLibrary("Ant")
it.excludeProjectLibrary("Gradle")
},
@@ -1,10 +1,10 @@
<idea-plugin package="org.jetbrains.idea.devkit.gradle">
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<plugin id="org.jetbrains.plugins.gradle"/>
<module name="intellij.devkit.core"/>
<!-- endregion -->
<module name="intellij.gradle.java"/>
</dependencies>
<!-- endregion -->
<extensions defaultExtensionNs="org.jetbrains.plugins.gradle">
<frameworkSupport implementation="org.jetbrains.idea.devkit.gradle.GradleIntellijPluginFrameworkSupportProvider"/>
<kotlinDslFrameworkSupport implementation="org.jetbrains.idea.devkit.gradle.KdslGradleIntellijPluginFrameworkSupportProvider"/>
@@ -1,12 +1,13 @@
<idea-plugin>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<plugin id="org.jetbrains.idea.reposearch"/>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<plugin id="org.intellij.groovy"/>
<plugin id="org.jetbrains.idea.maven"/>
<module name="intellij.gradle.java"/>
<module name="intellij.gradle.java.groovy"/>
<!-- endregion -->
</dependencies>
<!-- endregion -->
<extensions defaultExtensionNs="org.jetbrains.idea.maven">
<repositoryProvider implementation="org.jetbrains.plugins.gradle.integrations.maven.GradleMavenRepositoryProvider"/>
@@ -1,10 +1,10 @@
<idea-plugin>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<plugin id="org.jetbrains.idea.gradle.dsl"/>
<plugin id="org.jetbrains.plugins.gradle"/>
<!-- endregion -->
<module name="intellij.gradle.java"/>
</dependencies>
<!-- endregion -->
<extensions defaultExtensionNs="org.jetbrains.plugins.gradle">
<externallyHandledExtensions implementation="org.jetbrains.plugins.gradle.service.resolve.static.GradleDslVersionCatalogHandler"/>
@@ -1,12 +1,12 @@
<idea-plugin>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<plugin id="com.intellij.completion.ml.ranking"/>
<plugin id="org.jetbrains.plugins.gradle"/>
<module name="intellij.gradle.java"/>
<module name="intellij.gradle.java.groovy"/>
<module name="intellij.java.psi"/>
<!-- endregion -->
</dependencies>
<!-- endregion -->
<extensions defaultExtensionNs="com.intellij">
<completion.ml.contextFeatures language="Groovy" implementationClass="com.intellij.gradle.java.groovy.ml.GradleGroovyContextFeatureProvider"/>
@@ -1,8 +1,8 @@
<idea-plugin visibility="public">
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<plugin id="org.intellij.groovy"/>
<plugin id="org.jetbrains.plugins.gradle"/>
<module name="intellij.gradle.java"/>
<module name="intellij.java.compiler.impl"/>
<module name="intellij.java.execution"/>
<module name="intellij.java.execution.impl"/>
@@ -11,8 +11,8 @@
<module name="intellij.java.psi"/>
<module name="intellij.java.ui"/>
<module name="intellij.properties.psi"/>
<!-- endregion -->
</dependencies>
<!-- endregion -->
<extensionPoints>
<extensionPoint qualifiedName="org.jetbrains.plugins.gradle.resolve.contributor" interface="com.intellij.gradle.java.groovy.service.resolve.GradleMethodContextContributor"
dynamic="true"/>
@@ -1,14 +1,14 @@
<idea-plugin>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<plugin id="org.jetbrains.plugins.gradle"/>
<module name="intellij.gradle.java"/>
<module name="intellij.gradle.java.groovy"/>
<module name="intellij.gradle.java.toml"/>
<module name="intellij.java.psi"/>
<module name="intellij.platform.uast"/>
<module name="intellij.toml.core"/>
<!-- endregion -->
</dependencies>
<!-- endregion -->
<extensions defaultExtensionNs="com.intellij">
<gotoDeclarationHandler implementation="com.intellij.gradle.java.groovy.toml.service.GradleVersionCatalogTomlAwareGotoDeclarationHandler"/>
@@ -1,12 +1,12 @@
<idea-plugin visibility="internal">
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<plugin id="org.jetbrains.idea.maven"/>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<plugin id="com.jetbrains.performancePlugin"/>
<plugin id="org.jetbrains.plugins.gradle"/>
<module name="intellij.gradle"/>
<!-- endregion -->
<module name="intellij.gradle.java"/>
</dependencies>
<!-- endregion -->
<extensions defaultExtensionNs="com.jetbrains">
<performancePlugin.commandProvider implementation="com.intellij.gradle.java.performance.GradleCommandProvider"/>
</extensions>
+16
View File
@@ -0,0 +1,16 @@
### auto-generated section `build intellij.gradle.java.plugin` start
load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
resourcegroup(
name = "plugin_resources",
srcs = glob(["resources/**/*"]),
strip_prefix = "resources"
)
jvm_library(
name = "plugin",
visibility = ["//visibility:public"],
srcs = glob([], allow_empty = True),
resources = [":plugin_resources"]
)
### auto-generated section `build intellij.gradle.java.plugin` end
@@ -0,0 +1,11 @@
<?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" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
@@ -1,5 +1,7 @@
- name: lib/gradle-java.jar
- name: lib/gradle-java-plugin.jar
modules:
- name: intellij.gradle.java.plugin
contentModules:
- name: intellij.gradle.java
- name: lib/gradle-jps.jar
modules:
@@ -0,0 +1,36 @@
<idea-plugin allow-bundled-update="true">
<name>Gradle for Java</name>
<!-- "org.jetbrains.plugins.gradle" id has been reused to avoid dependent plugins breakage-->
<id>org.jetbrains.plugins.gradle</id>
<vendor>JetBrains</vendor>
<category>Build Tools</category>
<description>
Provides Java Gradle projects import, run configuration and profiler integrations.
</description>
<dependencies>
<plugin id="org.intellij.groovy"/>
<module name="intellij.java.indexing"/>
<module name="intellij.java.ui"/>
<module name="intellij.platform.jps.build"/>
</dependencies>
<module value="com.intellij.modules.gradle.java"/>
<module value="org.jetbrains.plugins.gradle.java"/>
<content namespace="jetbrains">
<module name="intellij.gradle.java" loading="embedded"/>
<module name="intellij.gradle.profiler"/>
<module name="intellij.gradle.java.maven"/>
<module name="intellij.gradle.analysis"/>
<module name="intellij.gradle.dependencyUpdater"/>
<module name="intellij.gradle.java.performance"/>
<module name="intellij.gradle.java.toml"/>
<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"/>
<module name="intellij.gradle.java.properties"/>
</content>
</idea-plugin>

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

@@ -1,7 +1,7 @@
<idea-plugin>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<plugin id="org.jetbrains.plugins.gradle"/>
<module name="intellij.gradle.java"/>
<module name="intellij.gradle.java.groovy"/>
<module name="intellij.java.psi"/>
<module name="intellij.properties.backend.psi"/>
@@ -1,40 +1,23 @@
<idea-plugin allow-bundled-update="true">
<name>Gradle for Java</name>
<!-- "org.jetbrains.plugins.gradle" id has been reused to avoid dependent plugins breakage-->
<id>org.jetbrains.plugins.gradle</id>
<vendor>JetBrains</vendor>
<category>Build Tools</category>
<description>
Provides Java Gradle projects import, run configuration and profiler integrations.
</description>
<idea-plugin visibility="public">
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<plugin id="org.intellij.groovy"/>
<plugin id="com.intellij.gradle"/>
<plugin id="com.jetbrains.performancePlugin"/>
<module name="intellij.gradle"/>
<module name="intellij.java"/>
<module name="intellij.java.compiler"/>
<module name="intellij.java.compiler.impl"/>
<module name="intellij.java.debugger.impl"/>
<module name="intellij.java.debugger.impl.shared"/>
<module name="intellij.java.execution"/>
<module name="intellij.java.execution.impl"/>
<module name="intellij.java.impl"/>
<module name="intellij.java.indexing"/>
<module name="intellij.java.ui"/>
<module name="intellij.platform.jps.build"/>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<module name="intellij.gradle"/>
<!-- endregion -->
<module name="intellij.properties.backend.psi"/>
</dependencies>
<module value="com.intellij.modules.gradle.java"/>
<module value="org.jetbrains.plugins.gradle.java"/>
<content namespace="jetbrains">
<module name="intellij.gradle.profiler"/>
<module name="intellij.gradle.java.maven"/>
<module name="intellij.gradle.analysis"/>
<module name="intellij.gradle.dependencyUpdater"/>
<module name="intellij.gradle.java.performance"/>
<module name="intellij.gradle.java.toml"/>
<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"/>
<module name="intellij.gradle.java.properties"/>
</content>
<!-- endregion -->
<resource-bundle>messages.GradleInspectionBundle</resource-bundle>
<extensionPoints>
@@ -1,11 +1,11 @@
<idea-plugin visibility="public">
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<plugin id="org.jetbrains.plugins.gradle"/>
<module name="intellij.gradle.java"/>
<module name="intellij.java.psi"/>
<module name="intellij.toml.core"/>
<!-- endregion -->
</dependencies>
<!-- endregion -->
<extensions defaultExtensionNs="com.intellij">
<elementDescriptionProvider implementation="com.intellij.gradle.java.toml.navigation.VersionCatalogDescriptionProvider"/>
@@ -1,13 +1,13 @@
<idea-plugin visibility="internal" package="org.jetbrains.kotlin.idea.gradleCodeInsightCommon">
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<module name="intellij.kotlin.gradle.tooling"/>
<module name="intellij.kotlin.projectWizard.idea"/>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<plugin id="org.jetbrains.plugins.gradle"/>
<module name="intellij.gradle.java"/>
<module name="intellij.kotlin.gradle.gradle"/>
<module name="kotlin.code-insight.inspections.shared"/>
<!-- endregion -->
</dependencies>
<!-- endregion -->
<extensionPoints>
<extensionPoint
@@ -1,13 +1,13 @@
<idea-plugin package="org.jetbrains.kotlin.idea.gradle.versionCatalog.toml.k2">
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<plugin id="com.intellij.modules.kotlin.k2"/>
<plugin id="org.jetbrains.plugins.gradle"/>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<module name="intellij.gradle.java"/>
<module name="intellij.gradle.java.toml"/>
<module name="intellij.kotlin.gradle.codeInsight.toml"/>
<!-- endregion -->
</dependencies>
<!-- endregion -->
<extensions defaultExtensionNs="org.jetbrains.kotlin">
<psiReferenceProvider implementation="org.jetbrains.kotlin.idea.gradle.versionCatalog.toml.k2.K2GradleTomlVersionCatalogPsiReferenceProviderContributor"/>
@@ -1,14 +1,14 @@
<idea-plugin package="org.jetbrains.kotlin.idea.gradle.versionCatalog.toml">
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<plugin id="org.toml.lang"/>
<module name="intellij.kotlin.gradle.gradle"/>
<module name="intellij.kotlin.gradle.tooling"/>
<module name="intellij.gradle.completion"/>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<plugin id="org.jetbrains.plugins.gradle"/>
<plugin id="org.toml.lang"/>
<module name="intellij.gradle.java"/>
<module name="intellij.gradle.java.toml"/>
<!-- endregion -->
</dependencies>
<!-- endregion -->
<extensions defaultExtensionNs="com.intellij">
<gotoDeclarationHandler
@@ -1,7 +1,10 @@
<idea-plugin package="org.jetbrains.kotlin.idea.gradleJava.k1">
<dependencies>
<module name="kotlin.gradle.gradle-java"/>
<plugin id="com.intellij.modules.kotlin.k1"/>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<module name="intellij.gradle.java"/>
<module name="kotlin.gradle.gradle-java"/>
<!-- endregion -->
</dependencies>
</idea-plugin>
@@ -1,8 +1,10 @@
<idea-plugin package="org.jetbrains.kotlin.idea.gradleJava.k2">
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<module name="kotlin.gradle.gradle-java"/>
<plugin id="org.jetbrains.plugins.gradle"/>
<plugin id="com.intellij.modules.kotlin.k2"/>
<module name="kotlin.gradle.gradle-java"/>
<module name="intellij.gradle.java"/>
</dependencies>
<!-- endregion -->
</idea-plugin>
@@ -1,14 +1,16 @@
<idea-plugin visibility="internal" package="org.jetbrains.kotlin.idea.gradleJava">
<dependencies>
<module name="intellij.gradle"/>
<plugin id="org.jetbrains.plugins.gradle"/>
<module name="intellij.kotlin.gradle.tooling"/>
<module name="intellij.kotlin.gradle.gradle"/>
<module name="intellij.kotlin.gradle.codeInsight.common"/>
<module name="intellij.kotlin.projectWizard.idea"/>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<module name="intellij.gradle"/>
<module name="intellij.gradle.java"/>
<module name="intellij.kotlin.base.externalSystem"/>
<module name="intellij.kotlin.gradle.codeInsight.common"/>
<module name="intellij.kotlin.gradle.gradle"/>
<module name="intellij.kotlin.runConfigurations.jvm"/>
<!-- endregion -->
</dependencies>
<extensionPoints>
@@ -1,17 +1,17 @@
<idea-plugin package="org.jetbrains.kotlin.gradle.scripting.k2">
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<module name="intellij.kotlin.gradle.tooling"/>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<plugin id="org.jetbrains.plugins.gradle"/>
<module name="intellij.gradle"/>
<module name="intellij.gradle.java"/>
<module name="intellij.gradle.java.groovy"/>
<module name="intellij.gradle.java.toml"/>
<module name="intellij.kotlin.base.scripting"/>
<module name="intellij.kotlin.base.scripting.shared"/>
<module name="kotlin.gradle.gradle-java"/>
<module name="kotlin.gradle.scripting.shared"/>
<!-- endregion -->
</dependencies>
<!-- endregion -->
<projectListeners>
<listener
@@ -1,14 +1,14 @@
<idea-plugin package="org.jetbrains.kotlin.tools.projectWizard.gradle">
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<dependencies>
<module name="intellij.kotlin.gradle.tooling"/>
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
<plugin id="org.jetbrains.plugins.gradle"/>
<module name="intellij.gradle.java"/>
<module name="intellij.kotlin.gradle.codeInsight.common"/>
<module name="intellij.kotlin.projectWizard.idea"/>
<module name="kotlin.gradle.gradle-java"/>
<!-- endregion -->
</dependencies>
<!-- endregion -->
<extensions defaultExtensionNs="com.intellij">
<newProjectWizard.kotlin.buildSystem implementation="org.jetbrains.kotlin.tools.projectWizard.gradle.GradleKotlinNewProjectWizard"/>