From dd4b1abc6a7a85fbad045556717a2cb0ba3dbebd Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Mon, 15 Jan 2024 18:44:03 +0100
Subject: [PATCH] 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
---
 build.gradle.kts                 | 10 ----------
 gradle/verification-metadata.xml | 14 ++++----------
 gradle/versions.properties       |  4 ++--
 prepare/compiler/compiler.pro    |  1 +
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b078451d7af..e26edb76cf8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -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) {
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 25217414b74..e4eb7bb765c 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -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">
diff --git a/gradle/versions.properties b/gradle/versions.properties
index b1ec9a80e97..0df47cf0f93 100644
--- a/gradle/versions.properties
+++ b/gradle/versions.properties
@@ -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
diff --git a/prepare/compiler/compiler.pro b/prepare/compiler/compiler.pro
index 4ad8dc3c3f7..7df1d7cb851 100644
--- a/prepare/compiler/compiler.pro
+++ b/prepare/compiler/compiler.pro
@@ -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 {