From 6a0bf2803962f808d4ccf34f91d05795b17d1a40 Mon Sep 17 00:00:00 2001
From: "Ilia.Shulgin" <ilia.shulgin@jetbrains.com>
Date: Thu, 10 Jul 2025 14:26:19 +0200
Subject: [PATCH] [vcs] Convert vcs-api and vcs-api-core to V2 modules

GitOrigin-RevId: a6413f890725082c3f081fda8eb5dc378a6716a1
---
 .../platform-resources/src/META-INF/vcs-modules.xml |  2 ++
 .../resources/intellij.platform.tasks.xml           |  1 +
 platform/vcs-api/BUILD.bazel                        | 13 +++++++++++--
 platform/vcs-api/intellij.platform.vcs.iml          |  1 +
 .../vcs-api/resources/intellij.platform.vcs.xml     |  5 +++++
 .../resources/intellij.platform.vcs.core.xml        |  2 ++
 .../resources/intellij.platform.vcs.impl.xml        |  1 +
 .../resources/intellij.platform.coverage.xml        |  1 +
 .../resources/META-INF/plugin.xml                   |  7 +++++--
 xml/impl/resources/intellij.xml.impl.xml            |  1 +
 10 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 platform/vcs-api/resources/intellij.platform.vcs.xml
 create mode 100644 platform/vcs-api/vcs-api-core/resources/intellij.platform.vcs.core.xml

diff --git a/platform/platform-resources/src/META-INF/vcs-modules.xml b/platform/platform-resources/src/META-INF/vcs-modules.xml
index ee17459f841a..5861f8dae180 100644
--- a/platform/platform-resources/src/META-INF/vcs-modules.xml
+++ b/platform/platform-resources/src/META-INF/vcs-modules.xml
@@ -7,6 +7,8 @@
     <module name="intellij.platform.vcs.log.impl"/>
     <module name="intellij.platform.vcs.dvcs.impl"/>
     <module name="intellij.platform.vcs.impl.backend"/>
+    <module name="intellij.platform.vcs.core" loading="embedded"/>
+    <module name="intellij.platform.vcs" loading="embedded"/>
   </content>
 
   <xi:include href="/META-INF/vcs-modules-shared.xml"/>
diff --git a/platform/tasks-platform-api/resources/intellij.platform.tasks.xml b/platform/tasks-platform-api/resources/intellij.platform.tasks.xml
index 053ab0b0a6bf..84a66e58dd27 100644
--- a/platform/tasks-platform-api/resources/intellij.platform.tasks.xml
+++ b/platform/tasks-platform-api/resources/intellij.platform.tasks.xml
@@ -1,6 +1,7 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.platform.backend"/>
+    <module name="intellij.platform.vcs"/>
   </dependencies>
   <extensionPoints>
     <extensionPoint name="tasks.contextProvider" interface="com.intellij.tasks.context.WorkingContextProvider" dynamic="true"/>
diff --git a/platform/vcs-api/BUILD.bazel b/platform/vcs-api/BUILD.bazel
index 04eb7354f26c..f0fab8801dc3 100644
--- a/platform/vcs-api/BUILD.bazel
+++ b/platform/vcs-api/BUILD.bazel
@@ -1,5 +1,11 @@
 ### auto-generated section `build intellij.platform.vcs` start
-load("@rules_jvm//:jvm.bzl", "jvm_library")
+load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
+
+jvm_resources(
+  name = "vcs_resources",
+  files = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
 
 jvm_library(
   name = "vcs",
@@ -24,6 +30,9 @@ jvm_library(
     "@lib//:caffeine",
   ],
   exports = ["//platform/vcs-api/vcs-api-core:vcs-core"],
-  runtime_deps = ["//platform/backend"]
+  runtime_deps = [
+    ":vcs_resources",
+    "//platform/backend",
+  ]
 )
 ### auto-generated section `build intellij.platform.vcs` end
\ No newline at end of file
diff --git a/platform/vcs-api/intellij.platform.vcs.iml b/platform/vcs-api/intellij.platform.vcs.iml
index 69fec9a6b2fa..58fc72b6b594 100644
--- a/platform/vcs-api/intellij.platform.vcs.iml
+++ b/platform/vcs-api/intellij.platform.vcs.iml
@@ -3,6 +3,7 @@
   <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" />
diff --git a/platform/vcs-api/resources/intellij.platform.vcs.xml b/platform/vcs-api/resources/intellij.platform.vcs.xml
new file mode 100644
index 000000000000..36e78c2b4c70
--- /dev/null
+++ b/platform/vcs-api/resources/intellij.platform.vcs.xml
@@ -0,0 +1,5 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.platform.vcs.core"/>
+  </dependencies>
+</idea-plugin>
\ No newline at end of file
diff --git a/platform/vcs-api/vcs-api-core/resources/intellij.platform.vcs.core.xml b/platform/vcs-api/vcs-api-core/resources/intellij.platform.vcs.core.xml
new file mode 100644
index 000000000000..6fb76a66265d
--- /dev/null
+++ b/platform/vcs-api/vcs-api-core/resources/intellij.platform.vcs.core.xml
@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>
\ No newline at end of file
diff --git a/platform/vcs-impl/resources/intellij.platform.vcs.impl.xml b/platform/vcs-impl/resources/intellij.platform.vcs.impl.xml
index f92c94adcf71..13868bec4018 100644
--- a/platform/vcs-impl/resources/intellij.platform.vcs.impl.xml
+++ b/platform/vcs-impl/resources/intellij.platform.vcs.impl.xml
@@ -6,6 +6,7 @@
     <module name="intellij.platform.backend"/>
     <module name="intellij.libraries.microba"/>
     <module name="intellij.platform.vcs.impl.shared"/>
+    <module name="intellij.platform.vcs"/>
   </dependencies>
 
   <xi:include href="/META-INF/VcsExtensionPoints.xml"/>
diff --git a/plugins/coverage-common/resources/intellij.platform.coverage.xml b/plugins/coverage-common/resources/intellij.platform.coverage.xml
index e1036d55ea75..ced4c4aad5f2 100644
--- a/plugins/coverage-common/resources/intellij.platform.coverage.xml
+++ b/plugins/coverage-common/resources/intellij.platform.coverage.xml
@@ -3,6 +3,7 @@
 
   <dependencies>
     <module name="intellij.platform.coverage.agent"/>
+    <module name="intellij.platform.vcs"/>
   </dependencies>
 
   <extensionPoints>
diff --git a/plugins/settings-repository/resources/META-INF/plugin.xml b/plugins/settings-repository/resources/META-INF/plugin.xml
index 4b805a16bd00..ebe06f11429e 100644
--- a/plugins/settings-repository/resources/META-INF/plugin.xml
+++ b/plugins/settings-repository/resources/META-INF/plugin.xml
@@ -19,8 +19,11 @@
 ]]></description>
   <vendor>JetBrains</vendor>
 
-  <!-- otherwise plugin will be not loaded in tests -->
-  <depends>com.intellij.modules.xml</depends>
+  <dependencies>
+    <!-- otherwise plugin will be not loaded in tests -->
+    <plugin id="com.intellij.modules.xml"/>
+    <module name="intellij.platform.vcs"/>
+  </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">
     <ApplicationLoadListener implementation="org.jetbrains.settingsRepository.IcsApplicationLoadListener"/>
diff --git a/xml/impl/resources/intellij.xml.impl.xml b/xml/impl/resources/intellij.xml.impl.xml
index 4e22a271d6dc..a0e2ef9c4835 100644
--- a/xml/impl/resources/intellij.xml.impl.xml
+++ b/xml/impl/resources/intellij.xml.impl.xml
@@ -10,6 +10,7 @@
     <module name="intellij.libraries.xerces"/>
     <module name="intellij.xml.dom"/>
     <module name="intellij.xml.ui.common"/>
+    <module name="intellij.platform.vcs"/>
   </dependencies>
 
   <extensionPoints>