MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJ-CR-146078 IJPL-209510 introduce kotlinx-serialization core and json product modules

Browse Source 
GitOrigin-RevId: 9a5987861dd8d1af2c743e032a3794b172bacd8b
This commit is contained in:
Vladimir Krivosheev
2025-09-26 20:36:41 +00:00
committed by intellij-monorepo-bot
parent deb9fbb0de
commit 2ee32ba4c6
11 changed files with 97 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
+2
View File
@@ -643,6 +643,8 @@
<module fileurl="file://$PROJECT_DIR$/libraries/kotlin-test/intellij.libraries.kotlinTest.iml" filepath="$PROJECT_DIR$/libraries/kotlin-test/intellij.libraries.kotlinTest.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/kotlin-test-assertions-core-jvm/intellij.libraries.kotlinTestAssertionsCoreJvm.iml" filepath="$PROJECT_DIR$/libraries/kotlin-test-assertions-core-jvm/intellij.libraries.kotlinTestAssertionsCoreJvm.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/io/intellij.libraries.kotlinx.io.iml" filepath="$PROJECT_DIR$/libraries/io/intellij.libraries.kotlinx.io.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/kotlinx/serialization/core/intellij.libraries.kotlinx.serialization.core.iml" filepath="$PROJECT_DIR$/libraries/kotlinx/serialization/core/intellij.libraries.kotlinx.serialization.core.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/kotlinx/serialization/json/intellij.libraries.kotlinx.serialization.json.iml" filepath="$PROJECT_DIR$/libraries/kotlinx/serialization/json/intellij.libraries.kotlinx.serialization.json.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/ktor-client/intellij.libraries.ktor.client.iml" filepath="$PROJECT_DIR$/libraries/ktor-client/intellij.libraries.ktor.client.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/ktor-client-cio/intellij.libraries.ktor.client.cio.iml" filepath="$PROJECT_DIR$/libraries/ktor-client-cio/intellij.libraries.ktor.client.cio.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/lucene.common/intellij.libraries.lucene.common.iml" filepath="$PROJECT_DIR$/libraries/lucene.common/intellij.libraries.lucene.common.iml" />
build/bazel-generated-file-list.txt
+2
View File
@@ -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
libraries/kotlinx/serialization/core/BUILD.bazel
+21
View File
@@ -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
libraries/kotlinx/serialization/core/intellij.libraries.kotlinx.serialization.core.iml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" 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="module" module-name="intellij.libraries.kotlinx.serialization.core" />
<orderEntry type="library" exported="" name="kotlinx-serialization-core" level="project" />
</component>
</module>
libraries/kotlinx/serialization/core/resources/intellij.libraries.kotlinx.serialization.core.xml
+2
View File
@@ -0,0 +1,2 @@
<idea-plugin>
</idea-plugin>
libraries/kotlinx/serialization/json/BUILD.bazel
+21
View File
@@ -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
libraries/kotlinx/serialization/json/intellij.libraries.kotlinx.serialization.json.iml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" 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="module" module-name="intellij.libraries.kotlinx.serialization.core" />
<orderEntry type="library" exported="" name="kotlinx-serialization-json" level="project" />
</component>
</module>
libraries/kotlinx/serialization/json/resources/intellij.libraries.kotlinx.serialization.json.xml
+5
View File
@@ -0,0 +1,5 @@
<idea-plugin>
<dependencies>
<module name="intellij.libraries.kotlinx.serialization.core"/>
</dependencies>
</idea-plugin>
platform/build-scripts/src/org/jetbrains/intellij/build/dev/IdeBuilder.kt
+4 -4
View File
@@ -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 }
}
}
platform/platform-resources/src/META-INF/essential-libs.xml
+11
View File
@@ -0,0 +1,11 @@
<idea-plugin>
<content>
<module name="intellij.libraries.kotlinx.io"/>
<module name="intellij.libraries.kotlinx.serialization.core" loading="embedded"/>
<module name="intellij.libraries.kotlinx.serialization.json" loading="embedded"/>
<module name="intellij.libraries.ktor.client"/>
<module name="intellij.libraries.ktor.client.cio"/>
</content>
</idea-plugin>
platform/platform-resources/src/META-INF/essential-modules.xml
+3 -5
View File
@@ -1,10 +1,8 @@
<idea-plugin>
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="/META-INF/essential-libs.xml"/>
<content>
<module name="intellij.platform.settings.local"/>
<module name="intellij.libraries.ktor.client"/>
<module name="intellij.libraries.ktor.client.cio"/>
<module name="intellij.libraries.kotlinx.io"/>
<module name="intellij.platform.backend"/>
<module name="intellij.platform.rpc.backend"/>