Fix multiple allocations of empty PersistentMap in PersistentSetMultimap

The `persistentMapOf` overload without arguments should be used there.

The needed overload is not available in the version of `kotlinx.immmutable 0.3.2`,
so the library is updated to the latest version.

This commit also removes the dependency on the `kotlinx-collections-immutable-metadata`
as it's not published anymore for new versions of `kotlinx-collections-immutable`.

^KT-64987 fixed
This commit is contained in:
Ilya Kirillov
2024-01-15 18:44:03 +01:00
committed by Space Team
parent 0e98eb5bb4
commit dd4b1abc6a
4 changed files with 7 additions and 22 deletions
-10
View File
@@ -1104,16 +1104,6 @@ plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin:
}
}
dependencies {
// Drop when KT-61766 fixed
add(
configurations.implicitDependencies.name,
"org.jetbrains.kotlinx:kotlinx-collections-immutable-metadata:${rootProject.extra["versions.kotlinx-collections-immutable"]}"
) {
isTransitive = false
}
}
afterEvaluate {
if (cacheRedirectorEnabled) {
rootProject.plugins.withType(org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin::class.java) {
+4 -10
View File
@@ -4128,16 +4128,10 @@
<sha256 value="e63dbc37232112465068b898718f2f7029d08ee82c83db9663f9a0de0f4bf470" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlinx" name="kotlinx-collections-immutable-jvm" version="0.3.1">
<artifact name="kotlinx-collections-immutable-jvm-0.3.1.jar">
<md5 value="b203f756c572b00b6fba610a7c80acd8" origin="Generated by Gradle"/>
<sha256 value="6d9e0951d51f23dc4821db84d7df8be51e27c788bcbc28140aa6c7b845b9e336" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlinx" name="kotlinx-collections-immutable-metadata" version="0.3.1">
<artifact name="kotlinx-collections-immutable-metadata-0.3.1.jar">
<md5 value="81f39cd0aae3927907ee6aa19694a9d2" origin="Generated by Gradle"/>
<sha256 value="774a4e48b2e3c0067933c8ad4d7262bec450321142fa251147ae64cde8cacf92" origin="Generated by Gradle"/>
<component group="org.jetbrains.kotlinx" name="kotlinx-collections-immutable-jvm" version="0.3.7">
<artifact name="kotlinx-collections-immutable-jvm-0.3.7.jar">
<md5 value="33920449b91d9a9b23f3599f01f9f458" origin="Generated by Gradle"/>
<sha256 value="0c461865231ff825d6fa18d9d333363c1f3866ffb685451e5fca66c1f22c873e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core" version="1.5.0">
+2 -2
View File
@@ -35,8 +35,8 @@ versions.jline=3.24.1
versions.jsr305=1.3.9
# kotlin-reflect has version which is bundled in minimally supported IDEA
versions.kotlin-reflect=1.6.10
versions.kotlinx-collections-immutable-jvm=0.3.1
versions.kotlinx-collections-immutable=0.3.1
versions.kotlinx-collections-immutable-jvm=0.3.7
versions.kotlinx-collections-immutable=0.3.7
# Version of the coroutines should be aligned with the oldest supported IntelliJ IDEA
versions.kotlinx-coroutines-core-jvm=1.5.0
+1
View File
@@ -317,6 +317,7 @@
}
-keepclassmembers class kotlinx.collections.immutable.ExtensionsKt {
kotlinx.collections.immutable.PersistentMap toPersistentHashMap(java.util.Map);
kotlinx.collections.immutable.PersistentMap persistentHashMapOf(kotlin.Pair[]);
kotlinx.collections.immutable.PersistentSet persistentHashSetOf(java.lang.Object[]);
}
-keepclassmembers class com.intellij.lang.jvm.JvmParameter {