From abe973919d7a6ce6c03e5aa00a569176df2c3556 Mon Sep 17 00:00:00 2001
From: Sergei Vorobyov <sergey.vorobyov@jetbrains.com>
Date: Mon, 13 May 2024 16:18:58 +0200
Subject: [PATCH] [Gradle|Plugin] fix: simplified the Gradle common module
 structure

intellij.gradle.common module is too irregular for our dev infrastructure.
DevKit plugin cannot generate the workspace model metadata for the Gradle plugin.

GitOrigin-RevId: cbf867cd246bc36bbfc72a8dfb7eb07badacc59e
---
 plugins/gradle/intellij.gradle.common.iml     | 44 +------------------
 plugins/gradle/intellij.gradle.iml            | 38 +++++++++++++++-
 .../intellij.gradle.toolingProxy.iml          |  2 +-
 3 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/plugins/gradle/intellij.gradle.common.iml b/plugins/gradle/intellij.gradle.common.iml
index 008c1be68b86..d1452d9b2a9c 100644
--- a/plugins/gradle/intellij.gradle.common.iml
+++ b/plugins/gradle/intellij.gradle.common.iml
@@ -2,50 +2,8 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$/generated">
-      <sourceFolder url="file://$MODULE_DIR$/generated" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/resources">
-      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-    </content>
-    <content url="file://$MODULE_DIR$/src">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.externalSystem" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" exported="" />
-    <orderEntry type="module" module-name="intellij.gradle.toolingExtension" exported="" />
-    <orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" />
-    <orderEntry type="module" module-name="intellij.platform.lang" />
-    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
-    <orderEntry type="module" module-name="intellij.platform.smRunner" exported="" />
-    <orderEntry type="library" exported="" name="slf4j-api" level="project" />
-    <orderEntry type="library" exported="" name="slf4j-jdk14" level="project" />
-    <orderEntry type="library" exported="" name="Gradle" level="project" />
-    <orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
-    <orderEntry type="library" name="ion" level="project" />
-    <orderEntry type="library" name="StreamEx" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.statistics" />
-    <orderEntry type="module" module-name="intellij.platform.inspect" exported="" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
-    <orderEntry type="library" name="commons-cli" level="project" />
-    <orderEntry type="module" module-name="intellij.properties.psi.impl" />
-    <orderEntry type="module" module-name="intellij.platform.core.ui" />
-    <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
-    <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
-    <orderEntry type="module" module-name="intellij.gradle.toolingProxy" />
-    <orderEntry type="module" module-name="intellij.platform.externalSystem.dependencyUpdater" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
-    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
-    <orderEntry type="library" name="opentelemetry" level="project" />
-    <orderEntry type="library" name="opentelemetry-semconv" level="project" />
-    <orderEntry type="library" name="commons-lang3" level="project" />
-    <orderEntry type="library" name="opentelemetry-exporter-otlp-common" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry.exporters" />
-    <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry.impl" />
+    <orderEntry type="module" module-name="intellij.gradle" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/gradle/intellij.gradle.iml b/plugins/gradle/intellij.gradle.iml
index e4358e2c2343..3195264b8b1a 100644
--- a/plugins/gradle/intellij.gradle.iml
+++ b/plugins/gradle/intellij.gradle.iml
@@ -4,9 +4,45 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/plugin-resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/generated" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.gradle.common" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.gradle.toolingExtension" exported="" />
+    <orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" exported="" />
+    <orderEntry type="library" exported="" name="slf4j-api" level="project" />
+    <orderEntry type="library" exported="" name="slf4j-jdk14" level="project" />
+    <orderEntry type="library" exported="" name="Gradle" level="project" />
+    <orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
+    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
+    <orderEntry type="library" name="ion" level="project" />
+    <orderEntry type="library" name="StreamEx" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.statistics" />
+    <orderEntry type="module" module-name="intellij.platform.inspect" exported="" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="commons-cli" level="project" />
+    <orderEntry type="module" module-name="intellij.properties.psi.impl" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
+    <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
+    <orderEntry type="module" module-name="intellij.gradle.toolingProxy" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem.dependencyUpdater" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
+    <orderEntry type="library" name="opentelemetry" level="project" />
+    <orderEntry type="library" name="opentelemetry-semconv" level="project" />
+    <orderEntry type="library" name="commons-lang3" level="project" />
+    <orderEntry type="library" name="opentelemetry-exporter-otlp-common" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry.exporters" />
+    <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry.impl" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/gradle/tooling-proxy/intellij.gradle.toolingProxy.iml b/plugins/gradle/tooling-proxy/intellij.gradle.toolingProxy.iml
index f23ed8cf3c29..df4babbd76ce 100644
--- a/plugins/gradle/tooling-proxy/intellij.gradle.toolingProxy.iml
+++ b/plugins/gradle/tooling-proxy/intellij.gradle.toolingProxy.iml
@@ -18,7 +18,7 @@
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$/src">
+    <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />