diff --git a/.idea/modules.xml b/.idea/modules.xml
index 7d5581130dc8..ddc5f14f30f5 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -643,6 +643,8 @@
+
+
diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt
index 3fae1fb71b45..af5be3dd8549 100644
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -359,6 +359,8 @@ libraries/junit5-params
libraries/junit5-pioneer
libraries/kotlin-test
libraries/kotlin-test-assertions-core-jvm
+libraries/kotlinx/serialization/core
+libraries/kotlinx/serialization/json
libraries/ktor-client
libraries/ktor-client-cio
libraries/lucene.common
diff --git a/libraries/kotlinx/serialization/core/BUILD.bazel b/libraries/kotlinx/serialization/core/BUILD.bazel
new file mode 100644
index 000000000000..eed1036f2493
--- /dev/null
+++ b/libraries/kotlinx/serialization/core/BUILD.bazel
@@ -0,0 +1,21 @@
+### auto-generated section `build intellij.libraries.kotlinx.serialization.core` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
+
+jvm_resources(
+ name = "core_resources",
+ files = glob(["resources/**/*"]),
+ strip_prefix = "resources"
+)
+
+jvm_library(
+ name = "core",
+ visibility = ["//visibility:public"],
+ srcs = glob([], allow_empty = True),
+ exports = ["@lib//:kotlinx-serialization-core"],
+ runtime_deps = [
+ ":core_resources",
+ "//libraries/kotlinx/serialization/core",
+ "@lib//:kotlinx-serialization-core",
+ ]
+)
+### auto-generated section `build intellij.libraries.kotlinx.serialization.core` end
\ No newline at end of file
diff --git a/libraries/kotlinx/serialization/core/intellij.libraries.kotlinx.serialization.core.iml b/libraries/kotlinx/serialization/core/intellij.libraries.kotlinx.serialization.core.iml
new file mode 100644
index 000000000000..d1c6f6a57ff0
--- /dev/null
+++ b/libraries/kotlinx/serialization/core/intellij.libraries.kotlinx.serialization.core.iml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/libraries/kotlinx/serialization/core/resources/intellij.libraries.kotlinx.serialization.core.xml b/libraries/kotlinx/serialization/core/resources/intellij.libraries.kotlinx.serialization.core.xml
new file mode 100644
index 000000000000..164f46cfcfb2
--- /dev/null
+++ b/libraries/kotlinx/serialization/core/resources/intellij.libraries.kotlinx.serialization.core.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/libraries/kotlinx/serialization/json/BUILD.bazel b/libraries/kotlinx/serialization/json/BUILD.bazel
new file mode 100644
index 000000000000..7c1013259547
--- /dev/null
+++ b/libraries/kotlinx/serialization/json/BUILD.bazel
@@ -0,0 +1,21 @@
+### auto-generated section `build intellij.libraries.kotlinx.serialization.json` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
+
+jvm_resources(
+ name = "json_resources",
+ files = glob(["resources/**/*"]),
+ strip_prefix = "resources"
+)
+
+jvm_library(
+ name = "json",
+ visibility = ["//visibility:public"],
+ srcs = glob([], allow_empty = True),
+ exports = ["@lib//:kotlinx-serialization-json"],
+ runtime_deps = [
+ ":json_resources",
+ "//libraries/kotlinx/serialization/core",
+ "@lib//:kotlinx-serialization-json",
+ ]
+)
+### auto-generated section `build intellij.libraries.kotlinx.serialization.json` end
\ No newline at end of file
diff --git a/libraries/kotlinx/serialization/json/intellij.libraries.kotlinx.serialization.json.iml b/libraries/kotlinx/serialization/json/intellij.libraries.kotlinx.serialization.json.iml
new file mode 100644
index 000000000000..f58d15f83b50
--- /dev/null
+++ b/libraries/kotlinx/serialization/json/intellij.libraries.kotlinx.serialization.json.iml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/libraries/kotlinx/serialization/json/resources/intellij.libraries.kotlinx.serialization.json.xml b/libraries/kotlinx/serialization/json/resources/intellij.libraries.kotlinx.serialization.json.xml
new file mode 100644
index 000000000000..1a56b618a08f
--- /dev/null
+++ b/libraries/kotlinx/serialization/json/resources/intellij.libraries.kotlinx.serialization.json.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/dev/IdeBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/dev/IdeBuilder.kt
index e6cf494d602f..4a651f4cf2e5 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/dev/IdeBuilder.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/dev/IdeBuilder.kt
@@ -132,7 +132,7 @@ data class BuildRequest(
}
@OptIn(ExperimentalCoroutinesApi::class)
-internal suspend fun buildProduct(request: BuildRequest, createProductProperties: suspend (CompilationContext) -> ProductProperties ): Path {
+internal suspend fun buildProduct(request: BuildRequest, createProductProperties: suspend (CompilationContext) -> ProductProperties): Path {
val rootDir = withContext(Dispatchers.IO) {
val rootDir = request.devRootDir
// if symlinked to RAM disk, use a real path for performance reasons and avoid any issues in ant/other code
@@ -308,7 +308,7 @@ internal suspend fun buildProduct(request: BuildRequest, createProductProperties
// ensure plugin dist files added to the list
pluginDistributionEntriesDeferred.await()
- spanBuilder("scramble platform").use{
+ spanBuilder("scramble platform").use {
request.scrambleTool?.scramble(platformLayout.await(), context)
}
copyDistFiles(
@@ -544,8 +544,8 @@ private suspend fun createBuildContext(
options = options,
customBuildPaths = result,
)
- .asBazelIfNeeded
- .let { if (options.unpackCompiledClassesArchives) it else it.asArchived }
+ .asBazelIfNeeded
+ .let { if (options.unpackCompiledClassesArchives) it else it.asArchived }
}
}
diff --git a/platform/platform-resources/src/META-INF/essential-libs.xml b/platform/platform-resources/src/META-INF/essential-libs.xml
new file mode 100644
index 000000000000..58c681aee26c
--- /dev/null
+++ b/platform/platform-resources/src/META-INF/essential-libs.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/platform/platform-resources/src/META-INF/essential-modules.xml b/platform/platform-resources/src/META-INF/essential-modules.xml
index 45a6b53a37d1..67955b89a2a1 100644
--- a/platform/platform-resources/src/META-INF/essential-modules.xml
+++ b/platform/platform-resources/src/META-INF/essential-modules.xml
@@ -1,10 +1,8 @@
-
+
+
+
-
-
-
-