From 4b5df51f7656f76e27766a02724062c3f8dc7b82 Mon Sep 17 00:00:00 2001
From: Nikita Katkov <nikita.katkov@jetbrains.com>
Date: Tue, 1 Apr 2025 19:39:55 +0200
Subject: [PATCH] [github] get rid of github.community module, move all its
 contents to the only main github module and replace module dependencies

GitOrigin-RevId: cbd24f0bbd2dff14164f7fe8b3d89c865cb52e0e
---
 .idea/modules.xml                             |  1 -
 intellij.idea.community.main.iml              |  1 -
 plugins/github/community/BUILD.bazel          | 20 -------------------
 .../intellij.vcs.github.community.iml         | 12 -----------
 .../resources/META-INF/plugin.xml             |  1 +
 .../resources/META-INF/pluginIcon.svg         |  0
 .../resources/META-INF/pluginIcon_dark.svg    |  0
 python/intellij.pycharm.community.main.iml    |  1 -
 8 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 plugins/github/community/BUILD.bazel
 delete mode 100644 plugins/github/community/intellij.vcs.github.community.iml
 rename plugins/github/{community => github-core}/resources/META-INF/plugin.xml (95%)
 rename plugins/github/{community => github-core}/resources/META-INF/pluginIcon.svg (100%)
 rename plugins/github/{community => github-core}/resources/META-INF/pluginIcon_dark.svg (100%)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 47dd8bf28b88..65ec17b46fcd 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1192,7 +1192,6 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/git4idea/rt/intellij.vcs.git.rt.iml" filepath="$PROJECT_DIR$/plugins/git4idea/rt/intellij.vcs.git.rt.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/git4idea/shared/intellij.vcs.git.shared.iml" filepath="$PROJECT_DIR$/plugins/git4idea/shared/intellij.vcs.git.shared.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/github/github-core/intellij.vcs.github.iml" filepath="$PROJECT_DIR$/plugins/github/github-core/intellij.vcs.github.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/github/community/intellij.vcs.github.community.iml" filepath="$PROJECT_DIR$/plugins/github/community/intellij.vcs.github.community.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/github/github-git/intellij.vcs.github.git.iml" filepath="$PROJECT_DIR$/plugins/github/github-git/intellij.vcs.github.git.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/github/github-json/intellij.vcs.github.json.iml" filepath="$PROJECT_DIR$/plugins/github/github-json/intellij.vcs.github.json.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/github/github-tracker/intellij.vcs.github.tracker.iml" filepath="$PROJECT_DIR$/plugins/github/github-tracker/intellij.vcs.github.tracker.iml" />
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index 94230be19185..82742799194e 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -218,7 +218,6 @@
     <orderEntry type="module" module-name="intellij.platform.ide.newUsersOnboarding" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.kotlin.onboarding-promoter" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.execution.process.elevation" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.vcs.github.community" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.vcs.gitlab.community" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.vcs.gitlab.yaml" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.util.coroutines.tests" scope="TEST" />
diff --git a/plugins/github/community/BUILD.bazel b/plugins/github/community/BUILD.bazel
deleted file mode 100644
index 90097236e632..000000000000
--- a/plugins/github/community/BUILD.bazel
+++ /dev/null
@@ -1,20 +0,0 @@
-### auto-generated section `build intellij.vcs.github.community` start
-load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
-
-jvm_resources(
-  name = "community_resources",
-  files = glob(["resources/**/*"]),
-  strip_prefix = "resources"
-)
-
-jvm_library(
-  name = "community",
-  visibility = ["//visibility:public"],
-  srcs = glob([], allow_empty = True),
-  exports = ["//plugins/github/github-core:vcs-github"],
-  runtime_deps = [
-    ":community_resources",
-    "//plugins/github/github-core:vcs-github",
-  ]
-)
-### auto-generated section `build intellij.vcs.github.community` end
\ No newline at end of file
diff --git a/plugins/github/community/intellij.vcs.github.community.iml b/plugins/github/community/intellij.vcs.github.community.iml
deleted file mode 100644
index ddb999ef2cb0..000000000000
--- a/plugins/github/community/intellij.vcs.github.community.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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" />
-    <orderEntry type="module" module-name="intellij.vcs.github" exported="" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/github/community/resources/META-INF/plugin.xml b/plugins/github/github-core/resources/META-INF/plugin.xml
similarity index 95%
rename from plugins/github/community/resources/META-INF/plugin.xml
rename to plugins/github/github-core/resources/META-INF/plugin.xml
index b7f741b292bc..9a9420b81e2c 100644
--- a/plugins/github/community/resources/META-INF/plugin.xml
+++ b/plugins/github/github-core/resources/META-INF/plugin.xml
@@ -18,6 +18,7 @@
   <content>
     <module name="intellij.vcs.github" loading="embedded"/>
     <module name="intellij.vcs.github.git"/>
+    <module name="intellij.vcs.github.ultimatePromo"/>
     <module name="intellij.vcs.github.tracker"/>
     <module name="intellij.vcs.github.json"/>
     <module name="intellij.vcs.github.ultimate.features"/>
diff --git a/plugins/github/community/resources/META-INF/pluginIcon.svg b/plugins/github/github-core/resources/META-INF/pluginIcon.svg
similarity index 100%
rename from plugins/github/community/resources/META-INF/pluginIcon.svg
rename to plugins/github/github-core/resources/META-INF/pluginIcon.svg
diff --git a/plugins/github/community/resources/META-INF/pluginIcon_dark.svg b/plugins/github/github-core/resources/META-INF/pluginIcon_dark.svg
similarity index 100%
rename from plugins/github/community/resources/META-INF/pluginIcon_dark.svg
rename to plugins/github/github-core/resources/META-INF/pluginIcon_dark.svg
diff --git a/python/intellij.pycharm.community.main.iml b/python/intellij.pycharm.community.main.iml
index 6ff461893727..3c8262c4e4ad 100644
--- a/python/intellij.pycharm.community.main.iml
+++ b/python/intellij.pycharm.community.main.iml
@@ -49,7 +49,6 @@
     <orderEntry type="module" module-name="intellij.evaluationPlugin" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.evaluationPlugin.languages.python" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.ide.newUiOnboarding" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.vcs.github.community" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.python.ml.features" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file