From b63a780e15e44582e4b14f607d5dda049eb54fc1 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Fri, 17 Nov 2023 11:33:29 +0100
Subject: [PATCH] Build: update kotlinx-metadata-jvm to 0.7.0

---
 gradle/libs.versions.toml                     |  2 +-
 gradle/verification-metadata.xml              | 20 +++++++++++++++----
 libraries/reflect/build.gradle.kts            |  9 +++++----
 .../build.gradle                              |  2 +-
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 820c08bd933..9c7d6852c8d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ shadow = "8.1.1" # Should be in sync with version in kotlin-native/
 spdx = "0.1.0-dev-10"
 proguard = "6.2.2"
 ktor = "2.3.3"
-kotlinx-metadataJvm = "0.6.2"
+kotlinx-metadataJvm = "0.7.0"
 # Forcing gson version because of https://github.com/google/gson/pull/1991
 gson = { strictly = "2.8.9" } # should be in sync with version.properties
 jetbrains-ideaExt = "1.0.1"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 97a4b4b3aa9..ba02e11cf26 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -3762,6 +3762,12 @@
             <sha256 value="4395647b1961d9fb730a34e8dbe56c293157bc0759004cca63d9b5ee6653e5c7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.0">
+         <artifact name="kotlin-stdlib-1.9.0.jar">
+            <md5 value="b00176dfa441dc78b9f121cafa3ab29f" origin="Generated by Gradle"/>
+            <sha256 value="35aeffbe2db5aa446072cee50fcee48b7fa9e2fc51ca37c0cc7d7d0bc39d952e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.10">
          <artifact name="kotlin-stdlib-1.9.10.jar">
             <md5 value="da8348128b101f854fafa9a31e3806bd" origin="Generated by Gradle"/>
@@ -3792,6 +3798,12 @@
             <sha256 value="fa20188abaa8ecf1d0035e93a969b071f10e45a1c8378c314521eade73f75fd5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.9.0">
+         <artifact name="kotlin-stdlib-common-1.9.0.jar">
+            <md5 value="6186241401652aed01bcc024bc3a92c5" origin="Generated by Gradle"/>
+            <sha256 value="283274204bd7c020789ec46f8f8e72af4244d7f550b3392a57e5ca006ad7aa2c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.9.10">
          <artifact name="kotlin-stdlib-common-1.9.10.jar">
             <md5 value="de4024a53c843e959f2d50ecd1f0e951" origin="Generated by Gradle"/>
@@ -4114,10 +4126,10 @@
             <sha256 value="8c075484fc5d9affc9425f68d476e438f61900cad1ceaa68473f069309c0ab85" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlinx" name="kotlinx-metadata-jvm" version="0.6.2">
-         <artifact name="kotlinx-metadata-jvm-0.6.2.jar">
-            <md5 value="54753fc5e62ddb7831d3539d2cf7728f" origin="Generated by Gradle"/>
-            <sha256 value="8f5759b435fcbcfdf06c80295013ba953db4ec817b04d7809c61a739a483527b" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-metadata-jvm" version="0.7.0">
+         <artifact name="kotlinx-metadata-jvm-0.7.0.jar">
+            <md5 value="a8526ee9dfbe7197d380dd1f4a9bdd6b" origin="Generated by Gradle"/>
+            <sha256 value="835a146fbb0f229c1b8968e88dca66e7ca567a98ad88d71219848e522ca894a7" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-metadata-klib" version="0.0.1-dev-10">
diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts
index 24b66a90ea6..7834519bf25 100644
--- a/libraries/reflect/build.gradle.kts
+++ b/libraries/reflect/build.gradle.kts
@@ -3,6 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.CacheableTransfor
 import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
 import kotlinx.metadata.jvm.KotlinModuleMetadata
+import kotlinx.metadata.jvm.UnstableMetadataApi
 import org.apache.tools.zip.ZipEntry
 import org.apache.tools.zip.ZipOutputStream
 import org.gradle.kotlin.dsl.support.serviceOf
@@ -11,7 +12,7 @@ description = "Kotlin Full Reflection Library"
 
 buildscript {
     dependencies {
-        classpath("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2")
+        classpath("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.7.0")
     }
 }
 
@@ -59,6 +60,7 @@ dependencies {
 }
 
 @CacheableTransformer
+@OptIn(UnstableMetadataApi::class)
 class KotlinModuleShadowTransformer(private val logger: Logger) : Transformer {
     @Suppress("ArrayInDataClass")
     private data class Entry(val path: String, val bytes: ByteArray)
@@ -76,8 +78,7 @@ class KotlinModuleShadowTransformer(private val logger: Logger) : Transformer {
 
         logger.info("Transforming ${context.path}")
         val metadata = KotlinModuleMetadata.read(context.`is`.readBytes())
-            ?: error("Not a .kotlin_module file: ${context.path}")
-        val module = metadata.toKmModule()
+        val module = metadata.kmModule
 
         val packageParts = module.packageParts.toMap()
         module.packageParts.clear()
@@ -91,7 +92,7 @@ class KotlinModuleShadowTransformer(private val logger: Logger) : Transformer {
             relocate(fqName) to parts
         }.toMap(module.packageParts)
 
-        data += Entry(context.path, KotlinModuleMetadata.write(module).bytes)
+        data += Entry(context.path, KotlinModuleMetadata.write(module))
     }
 
     override fun hasTransformedResource(): Boolean = data.isNotEmpty()
diff --git a/libraries/tools/binary-compatibility-validator/build.gradle b/libraries/tools/binary-compatibility-validator/build.gradle
index 48a07dba984..11ac8ddcb61 100644
--- a/libraries/tools/binary-compatibility-validator/build.gradle
+++ b/libraries/tools/binary-compatibility-validator/build.gradle
@@ -7,7 +7,7 @@ configurations {
 
 dependencies {
     api("org.jetbrains.kotlinx:binary-compatibility-validator:0.13.0")
-    api("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2")
+    api("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.7.0")
 
     testApi project(':kotlin-test:kotlin-test-junit')