IDEA-384935 Create content module for Artifacts Repository Search plugin

Space-RevId: c244c1c07ca2bbba7a93e5c579756b33f702ed36

GitOrigin-RevId: aff40657f0acdbb7ee556e273b5afb3f535d3716

.idea/modules.xml

@@ -1492,6 +1492,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/remote-control/intellij.remoteControl.iml" filepath="$PROJECT_DIR$/plugins/remote-control/intellij.remoteControl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/remoteDev-util/intellij.remoteDev.util.iml" filepath="$PROJECT_DIR$/platform/remoteDev-util/intellij.remoteDev.util.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/repository-search/intellij.repository.search.iml" filepath="$PROJECT_DIR$/plugins/repository-search/intellij.repository.search.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/repository-search/common/intellij.repository.search.common.iml" filepath="$PROJECT_DIR$/plugins/repository-search/common/intellij.repository.search.common.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/restructuredtext/intellij.restructuredtext.iml" filepath="$PROJECT_DIR$/plugins/restructuredtext/intellij.restructuredtext.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-restructuredtext/intellij.restructuredtext.python.iml" filepath="$PROJECT_DIR$/python/python-restructuredtext/intellij.restructuredtext.python.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/search-everywhere-ml/intellij.searchEverywhereMl.iml" filepath="$PROJECT_DIR$/plugins/search-everywhere-ml/intellij.searchEverywhereMl.iml" />

build/bazel-generated-file-list.txt

@@ -1392,6 +1392,7 @@ plugins/properties/tests
 plugins/rareJavaRefactorings
 plugins/remote-control
 plugins/repository-search
+plugins/repository-search/common
 plugins/restructuredtext
 plugins/search-everywhere-ml
 plugins/search-everywhere-ml/ranking/core

plugins/gradle-maven/BUILD.bazel

@@ -25,7 +25,7 @@ jvm_library(
     "//platform/platform-impl:ide-impl",
     "//platform/lang-impl",
     "//platform/projectModel-api:projectModel",
-    "//plugins/repository-search",
+    "//plugins/repository-search/common",
   ]
 )
 
@@ -47,8 +47,8 @@ jvm_library(
     "//platform/platform-impl:ide-impl",
     "//platform/lang-impl",
     "//platform/projectModel-api:projectModel",
-    "//plugins/repository-search",
-    "//plugins/repository-search:repository-search_test_lib",
+    "//plugins/repository-search/common",
+    "//plugins/repository-search/common:common_test_lib",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
   ]

plugins/gradle-maven/intellij.gradle.java.maven.iml

@@ -20,7 +20,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
-    <orderEntry type="module" module-name="intellij.repository.search" />
+    <orderEntry type="module" module-name="intellij.repository.search.common" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
   </component>
 </module>

plugins/gradle/BUILD.bazel

@@ -81,6 +81,7 @@ jvm_library(
     "//libraries/jspecify",
     "//plugins/repository-search",
     "//platform/util/text-matching",
+    "//plugins/repository-search/common",
   ],
   exports = [
     "//platform/external-system-api:externalSystem",
@@ -123,7 +124,7 @@ jvm_library(
     "//libraries/gson",
     "//libraries/guava",
     "//platform/forms_rt:java-guiForms-rt",
-    "//plugins/repository-search",
+    "//plugins/repository-search/common",
   ]
 )
 
@@ -196,8 +197,8 @@ jvm_library(
     "//platform/forms_rt:java-guiForms-rt",
     "//java/testFramework/backend",
     "@lib//:junit5Pioneer",
-    "//plugins/repository-search",
-    "//plugins/repository-search:repository-search_test_lib",
+    "//plugins/repository-search/common",
+    "//plugins/repository-search/common:common_test_lib",
   ],
   exports = ["//platform/external-system-api/testFramework"],
   runtime_deps = [":gradle-tests"]

plugins/gradle/intellij.gradle.iml

@@ -68,5 +68,6 @@
     <orderEntry type="module" module-name="intellij.libraries.jspecify" />
     <orderEntry type="module" module-name="intellij.repository.search" />
     <orderEntry type="module" module-name="intellij.platform.util.text.matching" />
+    <orderEntry type="module" module-name="intellij.repository.search.common" />
   </component>
 </module>

plugins/gradle/intellij.gradle.tests.iml

@@ -70,6 +70,6 @@
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
     <orderEntry type="module" module-name="intellij.java.testFramework.backend" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit5Pioneer" level="project" />
-    <orderEntry type="module" module-name="intellij.repository.search" />
+    <orderEntry type="module" module-name="intellij.repository.search.common" />
   </component>
 </module>

plugins/gradle/plugin-resources/META-INF/plugin.xml

@@ -22,6 +22,7 @@
     <plugin id="com.intellij.modules.lang"/>
     <plugin id="com.intellij.modules.externalSystem"/>
     <module name="intellij.platform.externalSystem.impl"/>
+    <module name="intellij.repository.search.common"/>
     <plugin id="org.jetbrains.idea.reposearch"/>
     <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.libraries.jspecify"/>

plugins/kotlin/gradle/code-insight-toml/BUILD.bazel

@@ -14,6 +14,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   resources = [":kotlin-gradle-codeInsight-toml_resources"],
   deps = [
+    "//plugins/toml/core",
     "@lib//:kotlinc-kotlin-compiler-common",
     "//platform/core-api:core",
     "//plugins/kotlin/base/util",
@@ -26,8 +27,7 @@ jvm_library(
     "//platform/indexing-api:indexing",
     "//plugins/gradle/java",
     "//plugins/toml",
-    "//plugins/toml/core",
-    "//plugins/repository-search",
+    "//plugins/repository-search/common",
     "//plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.shared:kotlin-gradle-scripting-shared",
   ]
 )

plugins/kotlin/gradle/code-insight-toml/intellij.kotlin.gradle.codeInsight.toml.iml

@@ -7,6 +7,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="module" module-name="intellij.toml.core" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
@@ -20,8 +21,7 @@
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.gradle.java" />
     <orderEntry type="module" module-name="intellij.toml" />
-    <orderEntry type="module" module-name="intellij.toml.core" />
-    <orderEntry type="module" module-name="intellij.repository.search" />
+    <orderEntry type="module" module-name="intellij.repository.search.common" />
     <orderEntry type="module" module-name="kotlin.gradle.scripting.shared" />
   </component>
 </module>

plugins/kotlin/gradle/gradle-java/tests.shared/BUILD.bazel

@@ -16,6 +16,7 @@ jvm_library(
     "@lib//:kotlin-test",
     "@lib//:kotlinc-kotlin-compiler-tests",
     "//plugins/kotlin/gradle/gradle-java",
+    "//plugins/repository-search/common",
   ]
 )
 
@@ -25,6 +26,7 @@ jvm_library(
   visibility = ["//visibility:public"],
   srcs = glob(["test/**/*.kt", "test/**/*.java", "test/**/*.form"], allow_empty = True),
   deps = [
+    "//jps/model-api:model",
     "@lib//:kotlin-stdlib",
     "//plugins/gradle:gradle-tests_test_lib",
     "//platform/analysis-api:analysis",
@@ -36,7 +38,6 @@ jvm_library(
     "//platform/external-system-impl:externalSystem-impl",
     "//platform/platform-util-io:ide-util-io",
     "//platform/indexing-api:indexing",
-    "//jps/model-api:model",
     "//platform/lang-core",
     "//platform/projectModel-api:projectModel",
     "//platform/testFramework",
@@ -107,8 +108,8 @@ jvm_library(
     "//java/java-runtime:rt",
     "//platform/execution",
     "//plugins/junit",
-    "//plugins/repository-search",
-    "//plugins/repository-search:repository-search_test_lib",
+    "//plugins/repository-search/common",
+    "//plugins/repository-search/common:common_test_lib",
     "//plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.shared:kotlin-gradle-scripting-shared",
     "//platform/util/text-matching",
     "//platform/util/text-matching:text-matching_test_lib",

plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml

@@ -6,6 +6,7 @@
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.gradle.tests" scope="TEST" />
@@ -18,7 +19,6 @@
     <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
@@ -78,7 +78,7 @@
     <orderEntry type="module" module-name="intellij.java.rt" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.execution" scope="TEST" />
     <orderEntry type="module" module-name="intellij.junit" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.repository.search" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.repository.search.common" />
     <orderEntry type="module" module-name="kotlin.gradle.scripting.shared" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.text.matching" scope="TEST" />
   </component>

plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.shared/BUILD.bazel

@@ -52,8 +52,8 @@ jvm_library(
     "//java/java-psi-api:psi",
     "//platform/lang-api:lang",
     "//platform/indexing-api:indexing",
-    "//plugins/repository-search",
     "//platform/eel-provider",
+    "//plugins/repository-search/common",
   ]
 )
 ### auto-generated section `build kotlin.gradle.scripting.shared` end

plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.shared/kotlin.gradle.scripting.shared.iml

@@ -47,7 +47,7 @@
     <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
-    <orderEntry type="module" module-name="intellij.repository.search" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" />
+    <orderEntry type="module" module-name="intellij.repository.search.common" />
   </component>
 </module>

plugins/maven/BUILD.bazel

@@ -24,6 +24,7 @@ jvm_library(
   srcs = glob(["src/main/java/**/*.kt", "src/main/java/**/*.java", "src/main/java/**/*.form", "src/main/gen/**/*.kt", "src/main/gen/**/*.java"], allow_empty = True),
   resources = [":maven_resources"],
   deps = [
+    "//plugins/repository-search/common",
     "//platform/analysis-api:analysis",
     "//platform/code-style-api:codeStyle",
     "//platform/editor-ui-api:editor-ui",

plugins/maven/intellij.maven.iml

@@ -9,6 +9,7 @@
       <excludeFolder url="file://$MODULE_DIR$/out" />
     </content>
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="module" module-name="intellij.repository.search.common" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle" />

plugins/maven/src/main/resources/META-INF/plugin.xml

@@ -65,7 +65,7 @@
   <dependencies>
     <module name="intellij.properties.backend"/>
     <plugin id="com.intellij.java"/>
-    <plugin id="org.jetbrains.idea.reposearch"/>
+    <module name="intellij.repository.search.common"/>
     <module name="intellij.java.aetherDependencyResolver"/>
   </dependencies>
 

plugins/maven/src/test/BUILD.bazel

@@ -14,6 +14,7 @@ jvm_library(
   runtime_deps = [
     "//platform/vcs-api:vcs",
     "//platform/util/progress",
+    "//plugins/repository-search/common",
   ]
 )
 
@@ -44,7 +45,6 @@ jvm_library(
     "//java/testFramework",
     "//platform/workspace/storage",
     "//plugins/repository-search",
-    "//plugins/repository-search:repository-search_test_lib",
     "@lib//:assert_j",
     "//platform/external-system-api/dependency-updater",
     "//platform/external-system-impl:externalSystem-tests_test_lib",
@@ -88,6 +88,8 @@ jvm_library(
     "//xml/xml-psi-impl:psi-impl",
     "//xml/xml-ui-common:ui-common",
     "//platform/execution",
+    "//plugins/repository-search/common",
+    "//plugins/repository-search/common:common_test_lib",
   ],
   runtime_deps = [":maven-tests"]
 )

plugins/maven/src/test/intellij.maven.tests.iml

@@ -65,5 +65,6 @@
     <orderEntry type="module" module-name="intellij.xml.psi.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.xml.ui.common" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.execution" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.repository.search.common" />
   </component>
 </module>

plugins/maven/testFramework/BUILD.bazel

@@ -40,6 +40,7 @@ jvm_library(
     "//xml/xml-analysis-impl:analysis-impl",
     "//platform/execution",
     "//java/testFramework/backend",
+    "//plugins/repository-search/common",
   ]
 )
 ### auto-generated section `build intellij.maven.testFramework` end

plugins/maven/testFramework/intellij.maven.testFramework.iml

@@ -57,5 +57,6 @@
     <orderEntry type="module" module-name="intellij.xml.analysis.impl" />
     <orderEntry type="module" module-name="intellij.platform.execution" />
     <orderEntry type="module" module-name="intellij.java.testFramework.backend" />
+    <orderEntry type="module" module-name="intellij.repository.search.common" />
   </component>
 </module>

plugins/repository-search/BUILD.bazel

@@ -13,24 +13,17 @@ create_kotlinc_options(
 
 resourcegroup(
   name = "repository-search_resources",
-  srcs = glob(["src/main/resources/**/*"]),
-  strip_prefix = "src/main/resources"
-)
-
-resourcegroup(
-  name = "repository-search_test_resources",
-  srcs = glob(["src/test/resources/**/*"]),
-  strip_prefix = "src/test/resources"
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
 )
 
 jvm_library(
   name = "repository-search",
-  module_name = "intellij.repository.search",
   visibility = ["//visibility:public"],
-  srcs = glob(["src/main/java/**/*.kt", "src/main/java/**/*.java", "src/main/java/**/*.form", "src/main/kotlin/**/*.kt", "src/main/kotlin/**/*.java", "src/main/kotlin/**/*.form"], allow_empty = True),
+  srcs = glob([], allow_empty = True),
   resources = [":repository-search_resources"],
-  kotlinc_opts = ":custom_repository-search",
-  deps = [
+  exports = ["@lib//:package-search-api-client"],
+  runtime_deps = [
     "//platform/core-api:core",
     "//platform/platform-api:ide",
     "//platform/core-impl",
@@ -53,57 +46,6 @@ jvm_library(
     "//libraries/kotlinx/document-store-mvstore:libraries-kotlinx-document-store-mvstore",
     "//libraries/mvstore",
     "//platform/eel",
-  ],
-  exports = ["@lib//:package-search-api-client"]
+  ]
 )
-
-jvm_library(
-  name = "repository-search_test_lib",
-  visibility = ["//visibility:public"],
-  srcs = glob(["src/test/kotlin/**/*.kt", "src/test/kotlin/**/*.java", "src/test/kotlin/**/*.form"], allow_empty = True),
-  resources = [":repository-search_test_resources"],
-  kotlinc_opts = ":custom_repository-search",
-  associates = [":repository-search"],
-  deps = [
-    "//platform/core-api:core",
-    "//platform/core-ui",
-    "//platform/platform-api:ide",
-    "//platform/core-impl",
-    "//platform/lang-api:lang",
-    "//platform/platform-impl:ide-impl",
-    "//platform/testFramework",
-    "//platform/testFramework:testFramework_test_lib",
-    "//plugins/maven-model",
-    "//platform/statistics",
-    "//platform/statistics:statistics_test_lib",
-    "//libraries/gson",
-    "//platform/platform-util-io:ide-util-io",
-    "//platform/util-ex",
-    "@lib//:kotlin-stdlib",
-    "//platform/util/concurrency",
-    "//platform/util/concurrency:concurrency_test_lib",
-    "//libraries/kotlinx/coroutines/core",
-    "//libraries/kotlinx/serialization/core",
-    "//libraries/kotlinx/serialization/json",
-    "//libraries/kotlinx/coroutines/slf4j",
-    "@lib//:ktor-client-mock",
-    "//libraries/kotlinx/coroutines/test",
-    "//libraries/io",
-    "//libraries/ktor/client",
-    "@lib//:package-search-api-client",
-    "//libraries/kotlinx/document-store-mvstore:libraries-kotlinx-document-store-mvstore",
-    "//libraries/mvstore",
-    "//platform/eel",
-  ],
-  exports = ["@lib//:package-search-api-client"]
-)
-### auto-generated section `build intellij.repository.search` end
-
-### auto-generated section `test intellij.repository.search` start
-load("@community//build:tests-options.bzl", "jps_test")
-
-jps_test(
-  name = "repository-search_test",
-  runtime_deps = [":repository-search_test_lib"]
-)
-### auto-generated section `test intellij.repository.search` end
+### auto-generated section `build intellij.repository.search` end

plugins/repository-search/common/BUILD.bazel

@@ -0,0 +1,118 @@
+### auto-generated section `build intellij.repository.search.common` start
+load("//build:compiler-options.bzl", "create_kotlinc_options")
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+create_kotlinc_options(
+  name = "custom_common",
+  opt_in = [
+    "kotlinx.serialization.InternalSerializationApi",
+    "kotlinx.serialization.ExperimentalSerializationApi",
+    "kotlinx.coroutines.ExperimentalCoroutinesApi",
+  ]
+)
+
+resourcegroup(
+  name = "common_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+resourcegroup(
+  name = "common_resources_1",
+  srcs = glob(["src/main/resources/**/*"]),
+  strip_prefix = "src/main/resources"
+)
+
+resourcegroup(
+  name = "common_test_resources",
+  srcs = glob(["src/test/resources/**/*"]),
+  strip_prefix = "src/test/resources"
+)
+
+jvm_library(
+  name = "common",
+  module_name = "intellij.repository.search.common",
+  visibility = ["//visibility:public"],
+  srcs = glob(["src/main/java/**/*.kt", "src/main/java/**/*.java", "src/main/java/**/*.form", "src/main/kotlin/**/*.kt", "src/main/kotlin/**/*.java", "src/main/kotlin/**/*.form"], allow_empty = True),
+  resources = [
+    ":common_resources",
+    ":common_resources_1",
+  ],
+  kotlinc_opts = ":custom_common",
+  deps = [
+    "//platform/core-api:core",
+    "//platform/platform-api:ide",
+    "//platform/core-impl",
+    "//platform/lang-api:lang",
+    "//platform/platform-impl:ide-impl",
+    "//plugins/maven-model",
+    "//platform/statistics",
+    "//libraries/gson",
+    "//platform/platform-util-io:ide-util-io",
+    "//platform/util-ex",
+    "@lib//:kotlin-stdlib",
+    "//platform/util/concurrency",
+    "//libraries/kotlinx/coroutines/core",
+    "//libraries/kotlinx/serialization/core",
+    "//libraries/kotlinx/serialization/json",
+    "//libraries/kotlinx/coroutines/slf4j",
+    "//libraries/io",
+    "//libraries/ktor/client",
+    "@lib//:package-search-api-client",
+    "//libraries/kotlinx/document-store-mvstore:libraries-kotlinx-document-store-mvstore",
+    "//libraries/mvstore",
+    "//platform/eel",
+  ],
+  exports = ["@lib//:package-search-api-client"]
+)
+
+jvm_library(
+  name = "common_test_lib",
+  visibility = ["//visibility:public"],
+  srcs = glob(["src/test/kotlin/**/*.kt", "src/test/kotlin/**/*.java", "src/test/kotlin/**/*.form"], allow_empty = True),
+  resources = [":common_test_resources"],
+  kotlinc_opts = ":custom_common",
+  associates = [":common"],
+  deps = [
+    "//platform/core-api:core",
+    "//platform/core-ui",
+    "//platform/platform-api:ide",
+    "//platform/core-impl",
+    "//platform/lang-api:lang",
+    "//platform/platform-impl:ide-impl",
+    "//platform/testFramework",
+    "//platform/testFramework:testFramework_test_lib",
+    "//plugins/maven-model",
+    "//platform/statistics",
+    "//platform/statistics:statistics_test_lib",
+    "//libraries/gson",
+    "//platform/platform-util-io:ide-util-io",
+    "//platform/util-ex",
+    "@lib//:kotlin-stdlib",
+    "//platform/util/concurrency",
+    "//platform/util/concurrency:concurrency_test_lib",
+    "//libraries/kotlinx/coroutines/core",
+    "//libraries/kotlinx/serialization/core",
+    "//libraries/kotlinx/serialization/json",
+    "//libraries/kotlinx/coroutines/slf4j",
+    "@lib//:ktor-client-mock",
+    "//libraries/kotlinx/coroutines/test",
+    "//libraries/io",
+    "//libraries/ktor/client",
+    "@lib//:package-search-api-client",
+    "//libraries/kotlinx/document-store-mvstore:libraries-kotlinx-document-store-mvstore",
+    "//libraries/mvstore",
+    "//platform/eel",
+  ],
+  exports = ["@lib//:package-search-api-client"]
+)
+### auto-generated section `build intellij.repository.search.common` end
+
+### auto-generated section `test intellij.repository.search.common` start
+load("@community//build:tests-options.bzl", "jps_test")
+
+jps_test(
+  name = "common_test",
+  runtime_deps = [":common_test_lib"]
+)
+### auto-generated section `test intellij.repository.search.common` end

plugins/repository-search/common/intellij.repository.search.common.iml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="kotlin-language" name="Kotlin">
+      <configuration version="5" platform="JVM 21" allPlatforms="JVM [21]" useProjectSettings="false">
+        <compilerSettings>
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=kotlinx.serialization.InternalSerializationApi -opt-in=kotlinx.serialization.ExperimentalSerializationApi -opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi -XXLanguage:+AllowEagerSupertypeAccessibilityChecks -progressive" />
+        </compilerSettings>
+        <compilerArguments>
+          <stringArguments>
+            <stringArg name="jvmTarget" arg="21" />
+            <stringArg name="apiVersion" arg="2.3" />
+            <stringArg name="languageVersion" arg="2.3" />
+          </stringArguments>
+          <arrayArguments>
+            <arrayArg name="pluginClasspaths">
+              <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
+            </arrayArg>
+          </arrayArguments>
+        </compilerArguments>
+      </configuration>
+    </facet>
+  </component>
+  <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/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.maven.model" />
+    <orderEntry type="module" module-name="intellij.platform.statistics" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
+    <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
+    <orderEntry type="module" module-name="intellij.platform.util.ex" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.concurrency" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.slf4j" />
+    <orderEntry type="library" scope="TEST" name="ktor-client-mock" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.test" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.io" />
+    <orderEntry type="module" module-name="intellij.libraries.ktor.client" />
+    <orderEntry type="library" exported="" name="package-search-api-client" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.document.store.mvstore" />
+    <orderEntry type="module" module-name="intellij.libraries.mvstore" />
+    <orderEntry type="module" module-name="intellij.platform.eel" />
+  </component>
+</module>

plugins/repository-search/common/resources/intellij.repository.search.common.xml

@@ -1,29 +1,17 @@
-<idea-plugin>
-  <id>org.jetbrains.idea.reposearch</id>
-  <name>Artifacts Repository Search</name>
-  <vendor>JetBrains</vendor>
-  <category>Build Tools</category>
-  <description><![CDATA[
-    Provides API for artifact search such as Maven/Gradle dependencies.
-  ]]></description>
-
+<idea-plugin visibility="public">
+  <!-- public because it's used in com.intellij.gradle plugin -->
   <dependencies>
     <module name="intellij.libraries.ktor.client"/>
     <module name="intellij.libraries.kotlinx.io"/>
     <module name="intellij.libraries.kotlinx.document.store.mvstore"/>
     <module name="intellij.libraries.kotlinx.coroutines.slf4j"/>
   </dependencies>
-  <!--suppress PluginXmlValidity -->
-  <content namespace="jetbrains">
-    <!-- The implicit main module of the plugin depends on internal modules (intellij.libraries.ktor.client, intellij.libraries.kotlinx.io), so it's required to set the namespace for it
-         todo: extract elements and dependencies to an explicit content module (see IJPL-212351) -->
-  </content>
 
   <extensionPoints>
-    <extensionPoint name="provider"
+    <extensionPoint qualifiedName="org.jetbrains.idea.reposearch.provider"
                     interface="org.jetbrains.idea.reposearch.DependencySearchProvidersFactory" dynamic="true"/>
 
-    <extensionPoint name="contributor"
+    <extensionPoint qualifiedName="org.jetbrains.idea.reposearch.contributor"
                     interface="org.jetbrains.idea.completion.api.DependencyCompletionContributor" dynamic="true"/>
   </extensionPoints>
 

plugins/repository-search/intellij.repository.search.iml

@@ -24,11 +24,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

plugins/repository-search/plugin-content.yaml

@@ -1,6 +1,9 @@
 - name: lib/maven-model.jar
   modules:
   - name: intellij.maven.model
+- name: lib/modules/intellij.repository.search.common.jar
+  contentModules:
+  - name: intellij.repository.search.common
 - name: lib/package-search-api-client.jar
   library: package-search-api-client
   files:

plugins/repository-search/resources/META-INF/plugin.xml

@@ -0,0 +1,20 @@
+<idea-plugin>
+  <id>org.jetbrains.idea.reposearch</id>
+  <name>Artifacts Repository Search</name>
+  <vendor>JetBrains</vendor>
+  <category>Build Tools</category>
+  <description><![CDATA[
+    Provides API for artifact search such as Maven/Gradle dependencies.
+  ]]></description>
+
+  <content namespace="jetbrains">
+    <module name="intellij.repository.search.common"/>
+  </content>
+
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+  <dependencies>
+    <module name="intellij.libraries.kotlinx.document.store.mvstore"/>
+  </dependencies>
+  <!-- endregion -->
+
+</idea-plugin>