From 03ccbf1b172a61cdd0b4c63402398e0984d00258 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Wed, 14 Jul 2021 13:55:45 +0200
Subject: [PATCH] Upgrade `kotlinx-metadata-jvm` and
 `binary-compatibility-validator` versions

---
 gradle/verification-metadata.xml              | 49 ++++++++++---------
 libraries/reflect/build.gradle.kts            |  2 +-
 .../build.gradle                              |  7 +--
 3 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 84289dc683e..5cbc67bb2d4 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -11629,13 +11629,13 @@
             <sha256 value="1af699f8d9ddab67f9a0d202fbd7915eb0362a5a6dfd5ffc54cafa3465c9cb0a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-     <component group="net.java.dev.jna" name="jna" version="5.6.0">
-       <artifact name="jna-5.6.0.jar">
-         <md5 value="56892d6f4d27019833fd53b7cc57ec86" origin="https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.6.0/"/>
-         <sha1 value="330f2244e9030119ab3030fc3fededc86713d9cc" origin="https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.6.0/"/>
-         <sha256 value="5557e235a8aa2f9766d5dc609d67948f2a8832c2d796cea9ef1d6cbe0b3b7eaf" origin="Generated by Gradle"/>
-       </artifact>
-     </component>
+      <component group="net.java.dev.jna" name="jna" version="5.6.0">
+         <artifact name="jna-5.6.0.jar">
+            <md5 value="56892d6f4d27019833fd53b7cc57ec86" origin="https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.6.0/"/>
+            <sha1 value="330f2244e9030119ab3030fc3fededc86713d9cc" origin="https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.6.0/"/>
+            <sha256 value="5557e235a8aa2f9766d5dc609d67948f2a8832c2d796cea9ef1d6cbe0b3b7eaf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.rubygrapefruit" name="native-platform" version="0.14">
          <artifact name="native-platform-0.14.jar">
             <md5 value="7d91f346c7ff91162d66f0e2428d49f6" origin="Generated by Gradle"/>
@@ -14206,6 +14206,7 @@
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-build-gradle-plugin" version="0.0.31">
          <artifact name="kotlin-build-gradle-plugin-0.0.31.jar">
+            <md5 value="5ef9aa3e70ca4e6c84e81746bc5e5f24" origin="Generated by Gradle"/>
             <sha256 value="58e432984087297aa22789c314df2ebc2e03cb5c854cf79ec9b24bcb5b405ca4" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -14519,14 +14520,10 @@
             <sha256 value="7a6bd3e09a63d6a57725cc3016465d2148b8febb82a6b165b33956f8a15e0b94" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlinx" name="binary-compatibility-validator" version="0.2.3">
-         <artifact name="binary-compatibility-validator-0.2.3.jar">
-            <md5 value="02699888fae9ef4c6dee3fed46bc4163" origin="Generated by Gradle"/>
-            <sha256 value="4dc80c2801121dd4dae8e9437e129d366613ba15d1c21ca25b2c8995c3cc4a0b" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="binary-compatibility-validator-0.2.3.pom">
-            <md5 value="223cb49fcf9368fb1a3a8b6d2145395d" origin="Generated by Gradle"/>
-            <sha256 value="d0a2e2e6e9219bb354979825a00d88260367d7ab93cd7e71f8ff3f7cfbcebc13" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlinx" name="binary-compatibility-validator" version="0.5.0">
+         <artifact name="binary-compatibility-validator-0.5.0.jar">
+            <md5 value="182080d1b43bf3328ad1566dd732780f" origin="Generated by Gradle"/>
+            <sha256 value="7febe38bd39cce08705c7d5b86b8ae369acaca64b54ca2ffc5211399efbc48f1" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-benchmark-plugin" version="0.3.1">
@@ -14632,6 +14629,12 @@
             <sha256 value="323ec5d212b83f25eec785897a69a97c7c6785b54fb50b27bebe659d15ad0d3e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.5.0">
+         <artifact name="kotlinx-coroutines-core-jvm-1.5.0.jar">
+            <md5 value="0a0d2e63b7d71b97778cbd41bb3dfce0" origin="Generated by Gradle"/>
+            <sha256 value="78d6cc7135f84d692ff3752fcfd1fa1bbe0940d7df70652e4f1eaeec0c78afbb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-metadata" version="1.3.8-native-mt-1.4.0-rc">
          <artifact name="kotlinx-coroutines-core-metadata-1.3.8-native-mt-1.4.0-rc.jar">
             <md5 value="ad04d9a5aa1a0644d07ea54777aca353" origin="Generated by Gradle"/>
@@ -14642,12 +14645,6 @@
             <sha256 value="8203cdee7508793a7989e0abffb28364a0cd1ed8801c3a6b3a70d430033d1de5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.5.0">
-         <artifact name="kotlinx-coroutines-core-jvm-1.5.0.jar">
-            <md5 value="0a0d2e63b7d71b97778cbd41bb3dfce0" origin="Generated by Gradle"/>
-            <sha256 value="78d6cc7135f84d692ff3752fcfd1fa1bbe0940d7df70652e4f1eaeec0c78afbb" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-metadata" version="1.4.2">
          <artifact name="kotlinx-coroutines-core-metadata-1.4.2.jar">
             <md5 value="8a47d1f6b24426367622f9d96b481452" origin="Generated by Gradle"/>
@@ -14795,9 +14792,11 @@
             <md5 value="7090a9abf5d42ecf16dcf485e25300b1" origin="Generated by Gradle"/>
             <sha256 value="a973efbc4571dcf5b02462b79f92f384e428886b287f12a9a2b41601ef971a5c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlinx-metadata-jvm-0.2.0.pom">
-            <md5 value="bd75552349efe9bbdf1fd24325f7432f" origin="Generated by Gradle"/>
-            <sha256 value="ef859523688819fb5103e5bc52e979de51248bbafd03f834039b222c9f9fa311" origin="Generated by Gradle"/>
+      </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-metadata-jvm" version="0.3.0">
+         <artifact name="kotlinx-metadata-jvm-0.3.0.jar">
+            <md5 value="33cb9d23d65af77e52ddff9ba969db33" origin="Generated by Gradle"/>
+            <sha256 value="fdaf7ba158465f6b6e9ce5762e0300fd681a976fbfeb5ed50fa5a2b26868cec8" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-metadata-klib" version="0.0.1-dev-10">
@@ -16411,6 +16410,7 @@
       </component>
       <component group="xerces" name="xercesImpl" version="2.12.0">
          <artifact name="xercesImpl-2.12.0.jar">
+            <md5 value="b89632b53c4939a2982bcb52806f6dec" origin="Generated by Gradle"/>
             <sha256 value="b50d3a4ca502faa4d1c838acb8aa9480446953421f7327e338c5dda3da5e76d0" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -16432,6 +16432,7 @@
       </component>
       <component group="xml-apis" name="xml-apis" version="1.4.01">
          <artifact name="xml-apis-1.4.01.jar">
+            <md5 value="7eaad6fea5925cca6c36ee8b3e02ac9d" origin="Generated by Gradle"/>
             <sha256 value="a840968176645684bb01aed376e067ab39614885f9eee44abe35a5f20ebe7fad" origin="Generated by Gradle"/>
          </artifact>
       </component>
diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts
index c0a9cf03d9c..0f71c95c2ea 100644
--- a/libraries/reflect/build.gradle.kts
+++ b/libraries/reflect/build.gradle.kts
@@ -12,7 +12,7 @@ description = "Kotlin Full Reflection Library"
 
 buildscript {
     dependencies {
-        classpath("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.2.0")
+        classpath("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.3.0")
     }
 }
 
diff --git a/libraries/tools/binary-compatibility-validator/build.gradle b/libraries/tools/binary-compatibility-validator/build.gradle
index 584c858ba35..16edaa80f6e 100644
--- a/libraries/tools/binary-compatibility-validator/build.gradle
+++ b/libraries/tools/binary-compatibility-validator/build.gradle
@@ -6,12 +6,7 @@ configurations {
 }
 
 dependencies {
-    // Override dependency of binary-compatibility-validator:0.2.3 on kotlinx-metadata-jvm:0.1.0,
-    // until the new version of the binary compatibility validator is released.
-    // kotlinx-metadata-jvm 0.1.0 can't read metadata of version 1.5 and greater.
-    runtimeOnly("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.2.0")
-
-    compile("org.jetbrains.kotlinx:binary-compatibility-validator:0.2.3")
+    compile("org.jetbrains.kotlinx:binary-compatibility-validator:0.5.0")
 
     testCompile project(':kotlin-test:kotlin-test-junit')