From a5fa69b8ee2be6e078766c56c2c9fa830e925c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steven=20Sch=C3=A4fer?= <stevenschaefer@google.com>
Date: Fri, 26 Nov 2021 18:59:05 +0100
Subject: [PATCH] jvm-abi-gen: use kotlinx-metadata 0.4.0 from maven

(cherry picked from commit f5e95444f82bb8e4be72dcef18da3a92277911e0)
---
 build.gradle.kts                     | 2 ++
 gradle/verification-metadata.xml     | 5 +++++
 plugins/jvm-abi-gen/build.gradle.kts | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 879b14e18c6..2cb83906ed4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -150,6 +150,8 @@ if (!project.hasProperty("versions.kotlin-native")) {
     extra["versions.kotlin-native"] = "1.6.20-dev-5356"
 }
 
+extra["versions.kotlinx-metadata-jvm"] = "0.4.0"
+
 val useJvmFir by extra(project.kotlinBuildProperties.useFir)
 
 val intellijSeparateSdks = project.getBooleanProperty("intellijSeparateSdks") ?: false
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index cc4ab82b457..947eb6804df 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -7542,6 +7542,11 @@
             <sha256 value="fdaf7ba158465f6b6e9ce5762e0300fd681a976fbfeb5ed50fa5a2b26868cec8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-metadata-jvm" version="0.4.0">
+         <artifact name="kotlinx-metadata-jvm-0.4.0.jar">
+            <sha256 value="0047c18edd9be7b097da27208341174c9826b098105621b901d4a4dbdd53d59d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-metadata-klib" version="0.0.1-dev-10">
          <artifact name="kotlinx-metadata-klib-0.0.1-dev-10.jar">
             <md5 value="eb72c22727bdbd6abf8649703c82ba68" origin="Generated by Gradle"/>
diff --git a/plugins/jvm-abi-gen/build.gradle.kts b/plugins/jvm-abi-gen/build.gradle.kts
index 822db33f0e0..96157eba867 100644
--- a/plugins/jvm-abi-gen/build.gradle.kts
+++ b/plugins/jvm-abi-gen/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
     // Note that kotlinx-metadata-jvm already includes kotlinx-metadata, core:metadata, core:metadata.jvm,
     // and protobuf-lite, so we only need to include kotlinx-metadata-jvm in the shadow jar.
     compileOnly(project(":kotlinx-metadata"))
-    shadows(project(":kotlinx-metadata-jvm"))
+    shadows(commonDep("org.jetbrains.kotlinx:kotlinx-metadata-jvm"))
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }