[gl] Distribute GitLab plugin as a single package for community and ultimate

#IJPL-198508 Fixed

GitOrigin-RevId: 6090b6cd4d37a2ca9d181992dc3411bec1718fd2

.idea/modules.xml

@@ -1199,7 +1199,6 @@
       <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" />
       <module fileurl="file://$PROJECT_DIR$/plugins/github/ultimate-promo/intellij.vcs.github.ultimatePromo.iml" filepath="$PROJECT_DIR$/plugins/github/ultimate-promo/intellij.vcs.github.ultimatePromo.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml" filepath="$PROJECT_DIR$/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/gitlab/gitlab-community/intellij.vcs.gitlab.community.iml" filepath="$PROJECT_DIR$/plugins/gitlab/gitlab-community/intellij.vcs.gitlab.community.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gitlab/gitlab-git/intellij.vcs.gitlab.git.iml" filepath="$PROJECT_DIR$/plugins/gitlab/gitlab-git/intellij.vcs.gitlab.git.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gitlab/gitlab-yaml/intellij.vcs.gitlab.yaml.iml" filepath="$PROJECT_DIR$/plugins/gitlab/gitlab-yaml/intellij.vcs.gitlab.yaml.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/hg4idea/intellij.vcs.hg.iml" filepath="$PROJECT_DIR$/plugins/hg4idea/intellij.vcs.hg.iml" />

BUILD.bazel

@@ -228,7 +228,6 @@ jvm_library(
     "//platform/new-users-onboarding",
     "//plugins/kotlin/onboarding-promoter",
     "//platform/execution-process-elevation",
-    "//plugins/gitlab/gitlab-community:vcs-gitlab-community",
     "//plugins/gitlab/gitlab-yaml:vcs-gitlab-yaml",
     "//plugins/yaml",
     "//platform/compose",
@@ -504,7 +503,6 @@ jvm_library(
     "//platform/new-users-onboarding",
     "//plugins/kotlin/onboarding-promoter",
     "//platform/execution-process-elevation",
-    "//plugins/gitlab/gitlab-community:vcs-gitlab-community",
     "//plugins/gitlab/gitlab-yaml:vcs-gitlab-yaml",
     "//plugins/yaml",
     "//platform/compose",

build/bazel-generated-file-list.txt

@@ -807,7 +807,6 @@ plugins/github/github-git
 plugins/github/github-json
 plugins/github/github-tracker
 plugins/github/ultimate-promo
-plugins/gitlab/gitlab-community
 plugins/gitlab/gitlab-core
 plugins/gitlab/gitlab-git
 plugins/gitlab/gitlab-yaml

build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt

@@ -49,8 +49,7 @@ open class IdeaCommunityProperties(private val communityHomeDir: Path) : BaseIde
       "intellij.idea.community.customization",
     )
     productLayout.bundledPluginModules = IDEA_BUNDLED_PLUGINS + sequenceOf(
-      "intellij.javaFX.community",
-      "intellij.vcs.gitlab.community"
+      "intellij.javaFX.community"
     )
 
     productLayout.prepareCustomPluginRepositoryForPublishedPlugins = false

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.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" />
     <orderEntry type="module" module-name="intellij.platform.util.progress.tests" scope="TEST" />

platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt

@@ -38,6 +38,7 @@ val IDEA_BUNDLED_PLUGINS: PersistentList<String> = DEFAULT_BUNDLED_PLUGINS + seq
   "intellij.vcs.svn",
   "intellij.vcs.hg",
   "intellij.vcs.github",
+  "intellij.vcs.gitlab",
   "intellij.groovy",
   "intellij.junit",
   "intellij.testng",

platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt

@@ -206,7 +206,7 @@ object CommunityRepositoryModules {
     pluginAuto(listOf("intellij.performanceTesting")),
     pluginAuto(listOf("intellij.performanceTesting.ui")),
     pluginAuto(listOf("intellij.vcs.github")),
-    gitlabPlugin("intellij.vcs.gitlab.community", productCode = "IC"),
+    pluginAuto(listOf("intellij.vcs.gitlab")),
     pluginAuto(listOf("intellij.compilation.charts")) { spec ->
       spec.withModule("intellij.compilation.charts.jps")
     },
@@ -629,17 +629,6 @@ object CommunityRepositoryModules {
     }
   }
 
-  // inspired by CommunityRepositoryModules.githubPlugin
-  fun gitlabPlugin(mainModuleName: String, productCode: String): PluginLayout {
-    return plugin(mainModuleName) { spec ->
-      spec.directoryName = "vcs-gitlab-$productCode"
-      spec.mainJarName = "vcs-gitlab.jar"
-      spec.withCustomVersion { _, version, _ ->
-        PluginVersionEvaluatorResult(pluginVersion = "$version-$productCode")
-      }
-    }
-  }
-
   fun groovyPlugin(additionalModules: List<String> = emptyList(), addition: ((PluginLayout.PluginLayoutSpec) -> Unit)? = null): PluginLayout {
     return plugin("intellij.groovy") { spec ->
       spec.directoryName = "Groovy"

plugins/gitlab/gitlab-community/BUILD.bazel

@@ -1,17 +0,0 @@
-### auto-generated section `build intellij.vcs.gitlab.community` start
-load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
-
-jvm_resources(
-  name = "vcs-gitlab-community_resources",
-  files = glob(["resources/**/*"]),
-  strip_prefix = "resources"
-)
-
-jvm_library(
-  name = "vcs-gitlab-community",
-  module_name = "intellij.vcs.gitlab.community",
-  visibility = ["//visibility:public"],
-  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
-  runtime_deps = [":vcs-gitlab-community_resources"]
-)
-### auto-generated section `build intellij.vcs.gitlab.community` end

plugins/gitlab/gitlab-community/intellij.vcs.gitlab.community.iml

@@ -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" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

plugins/gitlab/gitlab-community/src/org/jetbrains/plugins/gitlab/community/placeholder.txt

@@ -1,2 +0,0 @@
-This file is added as a workaround to have fake root package in intellij.vsc.gitlab.community module.
-It can be removed if any other files are added inside the current package.

plugins/gitlab/gitlab-core/plugin-content.yaml

@@ -0,0 +1,15 @@
+- name: lib/modules/intellij.vcs.gitlab.git.jar
+  contentModules:
+  - name: intellij.vcs.gitlab.git
+- name: lib/modules/intellij.vcs.gitlab.ultimate.ci.sh.jar
+  contentModules:
+  - name: intellij.vcs.gitlab.ultimate.ci.sh
+- name: lib/modules/intellij.vcs.gitlab.ultimate.features.jar
+  contentModules:
+  - name: intellij.vcs.gitlab.ultimate.features
+- name: lib/modules/intellij.vcs.gitlab.yaml.jar
+  contentModules:
+  - name: intellij.vcs.gitlab.yaml
+- name: lib/vcs-gitlab.jar
+  contentModules:
+  - name: intellij.vcs.gitlab

plugins/gitlab/gitlab-core/resources/META-INF/plugin.xml

@@ -1,4 +1,4 @@
-<idea-plugin package="org.jetbrains.plugins.gitlab.community" allow-bundled-update="false">
+<idea-plugin allow-bundled-update="true">
 
   <!-- Warn: remember to sync the following {name, id, vendor, category, description} tags
              with plugin.xml in intellij.vcs.gitlab.ultimate module-->
@@ -37,12 +37,11 @@
       ]]>
   </description>
 
-  <incompatible-with>com.intellij.modules.ultimate</incompatible-with>
-
   <content>
     <module name="intellij.vcs.gitlab" loading="embedded"/>
     <module name="intellij.vcs.gitlab.git"/>
     <module name="intellij.vcs.gitlab.yaml"/>
+    <module name="intellij.vcs.gitlab.ultimate.features"/>
+    <module name="intellij.vcs.gitlab.ultimate.ci.sh"/>
   </content>
-
 </idea-plugin>

python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt

@@ -34,7 +34,7 @@ open class PyCharmCommunityProperties(protected val communityHome: Path) : PyCha
         "intellij.pycharm.community.customization", // Convert Intellij to PyCharm
         "intellij.pycharm.community.customization.shared",
         "intellij.vcs.github",
-        "intellij.vcs.gitlab.community") +
+        "intellij.vcs.gitlab") +
       Files.readAllLines(communityHome.resolve("python/build/plugin-list.txt"))
 
     productLayout.skipUnresolvedContentModules = true