From 9200c626a77c2b50ce010e27a46b86322e4fdbef Mon Sep 17 00:00:00 2001
From: Mikhail Filippov <mikhail.filippov@jetbrains.com>
Date: Wed, 24 Dec 2025 23:57:42 +0400
Subject: [PATCH] [build] IJI-2993 update product layout

GitOrigin-RevId: b07f182d360f0eab4090f42c4f2f122022baf4e9
---
 .idea/modules.xml                              |  1 +
 build/bazel-generated-file-list.txt            |  1 +
 libraries/compose-runtime-desktop/BUILD.bazel  |  2 +-
 ...ellij.libraries.compose.runtime.desktop.iml |  2 +-
 .../module-content.yaml                        |  1 -
 ...ellij.libraries.compose.runtime.desktop.xml |  5 +++++
 libraries/jspecify/BUILD.bazel                 | 18 ++++++++++++++++++
 .../jspecify/intellij.libraries.jspecify.iml   | 12 ++++++++++++
 libraries/jspecify/module-content.yaml         |  6 ++++++
 .../resources/intellij.libraries.jspecify.xml  |  2 ++
 .../build/productLayout/CommunityModuleSets.kt |  1 +
 .../intellij.moduleSets.ide.common.xml         |  1 +
 plugins/gradle/BUILD.bazel                     |  2 +-
 plugins/gradle/intellij.gradle.iml             |  2 +-
 .../plugin-resources/META-INF/plugin.xml       |  3 +++
 plugins/gradle/tooling-proxy/BUILD.bazel       |  2 +-
 .../intellij.gradle.toolingProxy.iml           |  2 +-
 .../plugin/resources/META-INF/plugin.xml       |  3 +--
 18 files changed, 57 insertions(+), 9 deletions(-)
 create mode 100644 libraries/jspecify/BUILD.bazel
 create mode 100644 libraries/jspecify/intellij.libraries.jspecify.iml
 create mode 100644 libraries/jspecify/module-content.yaml
 create mode 100644 libraries/jspecify/resources/intellij.libraries.jspecify.xml

diff --git a/.idea/modules.xml b/.idea/modules.xml
index bba43d42c2db..e5378b3950ce 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -887,6 +887,7 @@
       <module fileurl="file://$PROJECT_DIR$/libraries/jgoodies/forms/intellij.libraries.jgoodies.forms.iml" filepath="$PROJECT_DIR$/libraries/jgoodies/forms/intellij.libraries.jgoodies.forms.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/jsonpath/intellij.libraries.jsonpath.iml" filepath="$PROJECT_DIR$/libraries/jsonpath/intellij.libraries.jsonpath.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/jsoup/intellij.libraries.jsoup.iml" filepath="$PROJECT_DIR$/libraries/jsoup/intellij.libraries.jsoup.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/jspecify/intellij.libraries.jspecify.iml" filepath="$PROJECT_DIR$/libraries/jspecify/intellij.libraries.jspecify.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/jsvg/intellij.libraries.jsvg.iml" filepath="$PROJECT_DIR$/libraries/jsvg/intellij.libraries.jsvg.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/junit4/intellij.libraries.junit4.iml" filepath="$PROJECT_DIR$/libraries/junit4/intellij.libraries.junit4.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/junit5/intellij.libraries.junit5.iml" filepath="$PROJECT_DIR$/libraries/junit5/intellij.libraries.junit5.iml" />
diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt
index f40a425b0d86..a567eb0a6c1b 100644
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -420,6 +420,7 @@ libraries/jgoodies/common
 libraries/jgoodies/forms
 libraries/jsonpath
 libraries/jsoup
+libraries/jspecify
 libraries/jsvg
 libraries/junit4
 libraries/junit5
diff --git a/libraries/compose-runtime-desktop/BUILD.bazel b/libraries/compose-runtime-desktop/BUILD.bazel
index 57436d1ee8a7..5cc247412333 100644
--- a/libraries/compose-runtime-desktop/BUILD.bazel
+++ b/libraries/compose-runtime-desktop/BUILD.bazel
@@ -21,7 +21,7 @@ jvm_library(
     "@lib//:libraries-compose-runtime-desktop-androidx-compose-runtime-desktop",
     "@lib//:libraries-compose-runtime-desktop-androidx-compose-runtime-saveable-desktop",
     "@lib//:libraries-compose-runtime-desktop-androidx-compose-runtime-retain-desktop",
-    "@lib//:jspecify",
+    "//libraries/jspecify",
   ]
 )
 ### auto-generated section `build intellij.libraries.compose.runtime.desktop` end
\ No newline at end of file
diff --git a/libraries/compose-runtime-desktop/intellij.libraries.compose.runtime.desktop.iml b/libraries/compose-runtime-desktop/intellij.libraries.compose.runtime.desktop.iml
index 26c4e3812217..18615a7bcff7 100644
--- a/libraries/compose-runtime-desktop/intellij.libraries.compose.runtime.desktop.iml
+++ b/libraries/compose-runtime-desktop/intellij.libraries.compose.runtime.desktop.iml
@@ -128,6 +128,6 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="library" name="jspecify" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.jspecify" />
   </component>
 </module>
\ No newline at end of file
diff --git a/libraries/compose-runtime-desktop/module-content.yaml b/libraries/compose-runtime-desktop/module-content.yaml
index 0733707bfbc2..dca6c59e7291 100644
--- a/libraries/compose-runtime-desktop/module-content.yaml
+++ b/libraries/compose-runtime-desktop/module-content.yaml
@@ -14,7 +14,6 @@
       - name: $MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-runtime-compose-desktop/2/lifecycle-runtime-compose-desktop-2.jar
       - name: $MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-runtime-desktop/2/lifecycle-runtime-desktop-2.jar
       - name: $MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-common-jvm/2/lifecycle-common-jvm-2.jar
-      - name: $MAVEN_REPOSITORY$/org/jspecify/jspecify/1/jspecify-1.jar
       - name: $MAVEN_REPOSITORY$/androidx/arch/core/core-common/2/core-common-2.jar
       - name: $MAVEN_REPOSITORY$/androidx/annotation/annotation/1/annotation-1.jar
       androidx.compose.runtime.retain.desktop:
diff --git a/libraries/compose-runtime-desktop/resources/intellij.libraries.compose.runtime.desktop.xml b/libraries/compose-runtime-desktop/resources/intellij.libraries.compose.runtime.desktop.xml
index bf03841e6f89..c3ce3751ee42 100644
--- a/libraries/compose-runtime-desktop/resources/intellij.libraries.compose.runtime.desktop.xml
+++ b/libraries/compose-runtime-desktop/resources/intellij.libraries.compose.runtime.desktop.xml
@@ -1,2 +1,7 @@
 <idea-plugin visibility="internal">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+  <dependencies>
+    <module name="intellij.libraries.jspecify"/>
+  </dependencies>
+  <!-- endregion -->
 </idea-plugin>
\ No newline at end of file
diff --git a/libraries/jspecify/BUILD.bazel b/libraries/jspecify/BUILD.bazel
new file mode 100644
index 000000000000..7a15b96161fc
--- /dev/null
+++ b/libraries/jspecify/BUILD.bazel
@@ -0,0 +1,18 @@
+### auto-generated section `build intellij.libraries.jspecify` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "jspecify_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "jspecify",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  resources = [":jspecify_resources"],
+  exports = ["@lib//:jspecify"],
+  runtime_deps = ["@lib//:jspecify"]
+)
+### auto-generated section `build intellij.libraries.jspecify` end
\ No newline at end of file
diff --git a/libraries/jspecify/intellij.libraries.jspecify.iml b/libraries/jspecify/intellij.libraries.jspecify.iml
new file mode 100644
index 000000000000..75c184602b73
--- /dev/null
+++ b/libraries/jspecify/intellij.libraries.jspecify.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" 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="library" exported="" name="jspecify" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/libraries/jspecify/module-content.yaml b/libraries/jspecify/module-content.yaml
new file mode 100644
index 000000000000..d494b4101264
--- /dev/null
+++ b/libraries/jspecify/module-content.yaml
@@ -0,0 +1,6 @@
+- name: dist.all/lib/intellij.libraries.jspecify.jar
+  modules:
+  - name: intellij.libraries.jspecify
+  library: jspecify
+  files:
+  - name: $MAVEN_REPOSITORY$/org/jspecify/jspecify/1/jspecify-1.jar
\ No newline at end of file
diff --git a/libraries/jspecify/resources/intellij.libraries.jspecify.xml b/libraries/jspecify/resources/intellij.libraries.jspecify.xml
new file mode 100644
index 000000000000..970c87386739
--- /dev/null
+++ b/libraries/jspecify/resources/intellij.libraries.jspecify.xml
@@ -0,0 +1,2 @@
+<idea-plugin visibility="public">
+</idea-plugin>
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt
index ca2538296376..bfe451add80e 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt
@@ -414,6 +414,7 @@ object CommunityModuleSets {
     module("intellij.platform.langInjection.backend")
     module("intellij.libraries.grpc")
     module("intellij.libraries.grpc.netty.shaded")
+    module("intellij.libraries.jspecify")
 
     moduleSet(gridCore())
     moduleSet(vcs())
diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml
index 22cdd3f7e907..919317969bd6 100644
--- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml
+++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml
@@ -385,6 +385,7 @@
     <module name="intellij.platform.langInjection.backend"/>
     <module name="intellij.libraries.grpc"/>
     <module name="intellij.libraries.grpc.netty.shaded"/>
+    <module name="intellij.libraries.jspecify"/>
     <module name="intellij.platform.structuralSearch"/>
     <!-- endregion -->
   </content>
diff --git a/plugins/gradle/BUILD.bazel b/plugins/gradle/BUILD.bazel
index 05b6457a0dd5..8aa6b1fce196 100644
--- a/plugins/gradle/BUILD.bazel
+++ b/plugins/gradle/BUILD.bazel
@@ -46,7 +46,6 @@ jvm_library(
     "@lib//:slf4j-jdk14",
     "//platform/ide-core-impl",
     "@lib//:gradle",
-    "@lib//:jspecify",
     "//libraries/gson",
     "//platform/object-serializer:objectSerializer-annotations",
     "//libraries/ion",
@@ -79,6 +78,7 @@ jvm_library(
     "//platform/util/coroutines",
     "//platform/execution",
     "//platform/forms_rt:java-guiForms-rt",
+    "//libraries/jspecify",
   ],
   exports = [
     "//platform/external-system-api:externalSystem",
diff --git a/plugins/gradle/intellij.gradle.iml b/plugins/gradle/intellij.gradle.iml
index 29c06d8b4871..81e4d6085a91 100644
--- a/plugins/gradle/intellij.gradle.iml
+++ b/plugins/gradle/intellij.gradle.iml
@@ -33,7 +33,6 @@
     <orderEntry type="library" exported="" name="slf4j-jdk14" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="library" exported="" name="Gradle" level="project" />
-    <orderEntry type="library" name="jspecify" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
     <orderEntry type="module" module-name="intellij.libraries.ion" />
@@ -66,5 +65,6 @@
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
     <orderEntry type="module" module-name="intellij.platform.execution" />
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
+    <orderEntry type="module" module-name="intellij.libraries.jspecify" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/gradle/plugin-resources/META-INF/plugin.xml b/plugins/gradle/plugin-resources/META-INF/plugin.xml
index 607044ccabc1..cbab574b1976 100644
--- a/plugins/gradle/plugin-resources/META-INF/plugin.xml
+++ b/plugins/gradle/plugin-resources/META-INF/plugin.xml
@@ -22,6 +22,9 @@
     <plugin id="com.intellij.modules.lang"/>
     <plugin id="com.intellij.modules.externalSystem"/>
     <module name="intellij.platform.externalSystem.impl"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.libraries.jspecify"/>
+    <!-- endregion -->
   </dependencies>
 
   <resource-bundle>messages.GradleBundle</resource-bundle>
diff --git a/plugins/gradle/tooling-proxy/BUILD.bazel b/plugins/gradle/tooling-proxy/BUILD.bazel
index 3e1cf89f48a0..b2f89fdd57f4 100644
--- a/plugins/gradle/tooling-proxy/BUILD.bazel
+++ b/plugins/gradle/tooling-proxy/BUILD.bazel
@@ -8,13 +8,13 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   kotlinc_opts = "@community//:k8",
   deps = [
-    "@lib//:jspecify",
     "@lib//:gradle",
     "@lib//:kotlin-stdlib",
     "@lib//:jetbrains-annotations",
     "@lib//:slf4j-api",
     "@lib//:slf4j-jdk14",
     "//plugins/gradle/tooling-extension-api:toolingExtension",
+    "//libraries/jspecify",
   ]
 )
 ### auto-generated section `build intellij.gradle.toolingProxy` end
\ No newline at end of file
diff --git a/plugins/gradle/tooling-proxy/intellij.gradle.toolingProxy.iml b/plugins/gradle/tooling-proxy/intellij.gradle.toolingProxy.iml
index 3286f2ecf82c..e4f48305adf4 100644
--- a/plugins/gradle/tooling-proxy/intellij.gradle.toolingProxy.iml
+++ b/plugins/gradle/tooling-proxy/intellij.gradle.toolingProxy.iml
@@ -23,12 +23,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="jspecify" level="project" />
     <orderEntry type="library" name="Gradle" level="project" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="jetbrains-annotations" level="project" />
     <orderEntry type="library" name="slf4j-api" level="project" />
     <orderEntry type="library" name="slf4j-jdk14" level="project" />
     <orderEntry type="module" module-name="intellij.gradle.toolingExtension" />
+    <orderEntry type="module" module-name="intellij.libraries.jspecify" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/plugin/resources/META-INF/plugin.xml b/plugins/kotlin/plugin/resources/META-INF/plugin.xml
index 43aee2ccef70..24019057c08c 100644
--- a/plugins/kotlin/plugin/resources/META-INF/plugin.xml
+++ b/plugins/kotlin/plugin/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="org.jetbrains.kotlin" xmlns:xi="http://www.w3.org/2001/XInclude" allow-bundled-update="true">
+ <idea-plugin package="org.jetbrains.kotlin" xmlns:xi="http://www.w3.org/2001/XInclude" allow-bundled-update="true">
   <id>org.jetbrains.kotlin</id>
   <name>Kotlin</name>
   <category>Languages</category>
@@ -16,7 +16,6 @@
   <vendor url="https://www.jetbrains.com">JetBrains</vendor>
 
   <dependencies>
-    <!-- IJ/AS-DEPENDENCY-PLACEHOLDER -->
     <plugin id="com.intellij.java"/>
     <module name="intellij.platform.ml.impl"/>
     <module name="intellij.platform.collaborationTools"/>