From bd2464440ea5b1784d64694fb2d629e13e4ea58c Mon Sep 17 00:00:00 2001
From: Vera Petrenkova <vera.petrenkova@jetbrains.com>
Date: Wed, 9 Apr 2025 12:28:55 +0200
Subject: [PATCH] [markdown] IJPL-177111 adjust module structure and rpc
 registration

GitOrigin-RevId: dfb37dd114291efabb3961b3e6535089c821f077
---
 .../markdown/core/backend/intellij.markdown.backend.iml   | 8 ++++----
 .../core/backend/resources/intellij.markdown.backend.xml  | 2 +-
 .../markdown/core/frontend/intellij.markdown.frontend.iml | 8 ++++----
 .../frontend/resources/intellij.markdown.frontend.xml     | 2 +-
 plugins/markdown/core/intellij.markdown.iml               | 8 ++++----
 plugins/markdown/core/plugin-content.yaml                 | 6 +-----
 6 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/plugins/markdown/core/backend/intellij.markdown.backend.iml b/plugins/markdown/core/backend/intellij.markdown.backend.iml
index e510b54d96a8..fe16babee279 100644
--- a/plugins/markdown/core/backend/intellij.markdown.backend.iml
+++ b/plugins/markdown/core/backend/intellij.markdown.backend.iml
@@ -9,15 +9,15 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
               <args>
                 <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
-                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.1.10-0.1/rhizomedb-compiler-plugin-2.1.10-0.1.jar</arg>
-                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.1.10-0.1/rpc-compiler-plugin-2.1.10-0.1.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.1.20-0.2/rhizomedb-compiler-plugin-2.1.20-0.2.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.1.20-0.2/rpc-compiler-plugin-2.1.20-0.2.jar</arg>
               </args>
             </arrayArg>
             <arrayArg name="pluginOptions" />
diff --git a/plugins/markdown/core/backend/resources/intellij.markdown.backend.xml b/plugins/markdown/core/backend/resources/intellij.markdown.backend.xml
index ca0cbe9fdc66..7ba473b1c93c 100644
--- a/plugins/markdown/core/backend/resources/intellij.markdown.backend.xml
+++ b/plugins/markdown/core/backend/resources/intellij.markdown.backend.xml
@@ -1,4 +1,4 @@
-<idea-plugin>
+<idea-plugin package="org.intellij.plugins.markdown.backend">
     <dependencies>
       <module name="intellij.platform.backend"/>
       <module name="intellij.platform.kernel.backend"/>
diff --git a/plugins/markdown/core/frontend/intellij.markdown.frontend.iml b/plugins/markdown/core/frontend/intellij.markdown.frontend.iml
index a7fc7849ff1f..4e59a8829ac2 100644
--- a/plugins/markdown/core/frontend/intellij.markdown.frontend.iml
+++ b/plugins/markdown/core/frontend/intellij.markdown.frontend.iml
@@ -9,15 +9,15 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
               <args>
                 <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
-                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.1.10-0.1/rhizomedb-compiler-plugin-2.1.10-0.1.jar</arg>
-                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.1.10-0.1/rpc-compiler-plugin-2.1.10-0.1.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.1.20-0.2/rhizomedb-compiler-plugin-2.1.20-0.2.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.1.20-0.2/rpc-compiler-plugin-2.1.20-0.2.jar</arg>
               </args>
             </arrayArg>
             <arrayArg name="pluginOptions" />
diff --git a/plugins/markdown/core/frontend/resources/intellij.markdown.frontend.xml b/plugins/markdown/core/frontend/resources/intellij.markdown.frontend.xml
index 0c26f84b7638..262205a3c9f8 100644
--- a/plugins/markdown/core/frontend/resources/intellij.markdown.frontend.xml
+++ b/plugins/markdown/core/frontend/resources/intellij.markdown.frontend.xml
@@ -1,4 +1,4 @@
-<idea-plugin>
+<idea-plugin package="org.intellij.plugins.markdown.frontend">
   <dependencies>
     <module name="intellij.platform.frontend"/>
   </dependencies>
diff --git a/plugins/markdown/core/intellij.markdown.iml b/plugins/markdown/core/intellij.markdown.iml
index ef3323b45cd5..46b49a9bf0c1 100644
--- a/plugins/markdown/core/intellij.markdown.iml
+++ b/plugins/markdown/core/intellij.markdown.iml
@@ -9,15 +9,15 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
               <args>
                 <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
-                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.1.10-0.1/rhizomedb-compiler-plugin-2.1.10-0.1.jar</arg>
-                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.1.10-0.1/rpc-compiler-plugin-2.1.10-0.1.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.1.20-0.2/rhizomedb-compiler-plugin-2.1.20-0.2.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.1.20-0.2/rpc-compiler-plugin-2.1.20-0.2.jar</arg>
               </args>
             </arrayArg>
             <arrayArg name="pluginOptions" />
diff --git a/plugins/markdown/core/plugin-content.yaml b/plugins/markdown/core/plugin-content.yaml
index 66e21423e92e..72e05440f7b8 100644
--- a/plugins/markdown/core/plugin-content.yaml
+++ b/plugins/markdown/core/plugin-content.yaml
@@ -11,9 +11,5 @@
   - name: intellij.markdown.model
   - name: intellij.markdown.spellchecker
   - name: intellij.markdown.compose.preview
-- name: lib/modules/intellij.markdown.backend.jar
-  contentModules:
-  - name: intellij.markdown.backend
-- name: lib/modules/intellij.markdown.frontend.jar
-  contentModules:
   - name: intellij.markdown.frontend
+  - name: intellij.markdown.backend
\ No newline at end of file