Update shadow plugin 6.1.0 -> 7.1.1

Version 7.1.1 is absent in jcenter, so additional repository was added
in some modules.

Leave old version in NewMultiplatformIT.kt because of
`This version of Shadow supports Gradle 7.0+ only. Please upgrade.` error.

^KTI-733 Fixed

buildSrc/build.gradle.kts

@@ -157,7 +157,7 @@ dependencies {
     implementation("net.rubygrapefruit:native-platform-windows-i386:${property("versions.native-platform")}")
     implementation("com.jakewharton.dex:dex-method-list:3.0.0")
 
-    implementation("com.github.jengelman.gradle.plugins:shadow:${rootProject.extra["versions.shadow"]}")
+    implementation("gradle.plugin.com.github.johnrengelman:shadow:${rootProject.extra["versions.shadow"]}")
     implementation("net.sf.proguard:proguard-gradle:6.2.2")
     implementation("org.jetbrains.intellij.deps:asm-all:8.0.1")
 

buildSrc/src/main/kotlin/ComponentsXmlResourceTransformerPatched.kt

@@ -29,6 +29,8 @@ class ComponentsXmlResourceTransformerPatched : Transformer {
     private val components: MutableMap<String, Xpp3Dom> =
         LinkedHashMap<String, Xpp3Dom>()
 
+    override fun getName() = "ComponentsXmlResourceTransformerPatched"
+
     override fun canTransformResource(element: FileTreeElement): Boolean {
         val path = element.relativePath.pathString
         return COMPONENTS_XML_PATH == path
@@ -107,7 +109,7 @@ class ComponentsXmlResourceTransformerPatched : Transformer {
                 }
                 Xpp3DomWriter.write(writer, dom)
             } finally {
-                IOUtil.close(writer)
+                writer.close()
             }
             return baos.toByteArray()
         }

gradle/verification-metadata.xml

@@ -1305,20 +1305,6 @@
             <sha256 value="6a53485a30aa16770c3a4109296333ad07a5da12cdbd98d391668a04f6c26b51" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.github.jengelman.gradle.plugins" name="shadow" version="6.1.0">
-         <artifact name="shadow-6.1.0.jar">
-            <md5 value="219329760e25a54748e92fdc84c87cf3" origin="https://plugins.gradle.org/m2/com/github/jengelman/gradle/plugins/shadow/6.1.0/"/>
-            <sha256 value="b66cb33a1d204ffaa1ba67393bdddbe9ff517f24f4438d11c341423868759aa3" origin="https://plugins.gradle.org/m2/com/github/jengelman/gradle/plugins/shadow/6.1.0/"/>
-         </artifact>
-         <artifact name="shadow-6.1.0.pom">
-            <md5 value="3de25c7db26b2a768b2ffd4f215c62ad" origin="https://plugins.gradle.org/m2/com/github/jengelman/gradle/plugins/shadow/6.1.0/ also trust https://jcenter.bintray.com/com/github/jengelman/gradle/plugins/shadow/6.1.0/shadow-6.1.0.pom">
-               <also-trust value="193bcc1bc98e816e23bbfa11ca2b1785"/>
-            </md5>
-            <sha256 value="d40c29bce31762b6c8539a87d2515324f44db9d7d579a5aa7016a15ce164abb8" origin="https://plugins.gradle.org/m2/com/github/jengelman/gradle/plugins/shadow/6.1.0/ also trust https://jcenter.bintray.com/com/github/jengelman/gradle/plugins/shadow/6.1.0/shadow-6.1.0.pom">
-               <also-trust value="4b4fb93cb95f167a632870d79f7225bf747b34a155da910e6cf71721ec20c771"/>
-            </sha256>
-         </artifact>
-      </component>
       <component group="com.github.node-gradle" name="gradle-node-plugin" version="2.2.0">
          <artifact name="gradle-node-plugin-2.2.0.jar">
             <md5 value="d3f177e0769076640635a5529559d245" origin="Generated by Gradle"/>
@@ -2505,45 +2491,23 @@
             <sha256 value="1f9626cbaa584ed5d86021866e4e367e26fe5efc248382652be68beeb43e7416" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="commons-io" name="commons-io" version="2.11.0">
+         <artifact name="commons-io-2.11.0.jar">
+            <md5 value="3b4b7ccfaeceeac240b804839ee1a1ca" origin="Generated by Gradle"/>
+            <sha256 value="961b2f6d87dbacc5d54abf45ab7a6e2495f89b75598962d8c723cea9bc210908" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="commons-io" name="commons-io" version="2.4">
          <artifact name="commons-io-2.4.jar">
             <md5 value="7f97854dc04c119d461fed14f5d8bb96" origin="Generated by Gradle"/>
             <sha256 value="cc6a41dc3eaacc9e440a6bd0d2890b20d36b4ee408fe2d67122f328bb6e01581" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="commons-io-2.4.pom">
-            <md5 value="a75b48557fe5da29195020755a5b1be7" origin="Generated by Gradle"/>
-            <sha256 value="b2b5dd46cf998fa626eb6f8a1c114f6167c8d392694164e62533e5898e9b31f2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="commons-io" name="commons-io" version="2.5">
-         <artifact name="commons-io-2.5.jar">
-            <md5 value="e2d74794fba570ec2115fb9d5b05dc9b" origin="Generated by Gradle"/>
-            <sha256 value="a10418348d234968600ccb1d988efcbbd08716e1d96936ccc1880e7d22513474" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="commons-io-2.5.pom">
-            <md5 value="60a9cb08b0599d74d4c5e55e4ca93a28" origin="Generated by Gradle"/>
-            <sha256 value="28ebb2998bc7d7acb25078526971640892000f3413586ff42d611f1043bfec30" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="commons-io" name="commons-io" version="2.6">
          <artifact name="commons-io-2.6.jar">
             <md5 value="467c2a1f64319c99b5faf03fc78572af" origin="Generated by Gradle"/>
             <sha256 value="f877d304660ac2a142f3865badfc971dec7ed73c747c7f8d5d2f5139ca736513" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="commons-io-2.6.pom">
-            <md5 value="142e515fa628cd8379aaac94ab237a8c" origin="Generated by Gradle"/>
-            <sha256 value="0c23863893a2291f5a7afdbd8d15923b3948afd87e563fa341cdcf6eae338a60" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="commons-io" name="commons-io" version="2.7">
-         <artifact name="commons-io-2.7.jar">
-            <md5 value="87709c85b69a685ddba69c65fe6dd6f9" origin="Generated by Gradle"/>
-            <sha256 value="4547858fff38bbf15262d520685b184a3dce96897bc1844871f055b96e8f6e95" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="commons-io-2.7.pom">
-            <md5 value="41ef9ef74b3d01325e9e58ed593746b4" origin="Generated by Gradle"/>
-            <sha256 value="6d5e5bf1fcd509ba978878e58a69edd552909d1c545d8f4fd44c6d435d825cf1" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="commons-lang" name="commons-lang" version="2.4">
          <artifact name="commons-lang-2.4.jar">
@@ -2717,6 +2681,12 @@
             <sha256 value="39493c1da24d9f5f160cc3fb6670b9cad023e65ce12a6673af32e47ddcdeb8c3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="gradle.plugin.com.github.johnrengelman" name="shadow" version="7.1.1">
+         <artifact name="shadow-7.1.1.jar">
+            <md5 value="9e32cfc3e579fba5bcbe4d6104d94cc4" origin="Generated by Gradle"/>
+            <sha256 value="a870861a7a3d54ffd97822051a27b2f1b86dd5c480317f0b97f3b27581b742af" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="gradle.plugin.org.gradle.crypto" name="checksum" version="1.2.0">
          <artifact name="checksum-1.2.0.jar">
             <md5 value="308b1ec3fc7e7444391471e2c895e51b" origin="Generated by Gradle"/>
@@ -3758,64 +3728,46 @@
             <sha256 value="4946e60a547c8eda69f3bc23c5b6f0dadcf8469ea49b1d1da7de34aecfcf18dd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.ant" name="ant" version="1.10.11">
+         <artifact name="ant-1.10.11.jar">
+            <md5 value="ee3529760a0cf967e19f38523adc603e" origin="Generated by Gradle"/>
+            <sha256 value="88c0b89bbbaae01e0d9fcae93be792f5abbe3409106f8eee858fdf365dbc0754" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.ant" name="ant" version="1.10.7">
          <artifact name="ant-1.10.7.jar">
             <md5 value="66386ce040556ca4836fe829d0f1b293" origin="Generated by Gradle"/>
             <sha256 value="dab4d3b2e45b73aec95cb25ce5050a651ad060f50f74662bbc3c1cb406ec1d19" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ant-1.10.7.pom">
-            <md5 value="c8ef52f3f5c96bcc80ce8bbe18dd7c8f" origin="Generated by Gradle"/>
-            <sha256 value="e85a765481374af0d123dfd66030f1b814a27474253962b9ec6b969e39569c59" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.apache.ant" name="ant" version="1.7.0">
          <artifact name="ant-1.7.0.jar">
             <md5 value="133e8979e9c11450f557ca890177fe0a" origin="Generated by Gradle"/>
             <sha256 value="92f72307e7440f1e352c916f2438d2bbab3ffd2cf730c71316117ad04abadea8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ant-1.7.0.pom">
-            <md5 value="0153222de881bd75a1a03c972966f98e" origin="Generated by Gradle"/>
-            <sha256 value="7c0217403f57a200cb80d489892ce04ea762f2a133abe3dd38470651434cfaf2" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.apache.ant" name="ant" version="1.8.0">
          <artifact name="ant-1.8.0.jar">
             <md5 value="10698208827c049177f7f42974e32016" origin="Generated by Gradle"/>
             <sha256 value="0251dbb938740ace07a53675113eee753ba389db65aebc814b175af50321620e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ant-1.8.0.pom">
-            <md5 value="bc79cbeac3f5bfb580d919c27b600c1c" origin="Generated by Gradle"/>
-            <sha256 value="e6d920d5a1a34aaaebab1e6a82c36bbfd61f1eeaabc4534ee05d4faad56f1b7a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.ant" name="ant" version="1.9.7">
-         <artifact name="ant-1.9.7.jar">
-            <md5 value="a14502c25ee6bc76c4614315845b29e9" origin="Generated by Gradle"/>
-            <sha256 value="9a5dbe3f5f2cb91854c8682cab80178afa412ab35a5ab718bf39ce01b3435d93" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="ant-1.9.7.pom">
-            <md5 value="351769fd53dccab468228fd2ce5306d9" origin="Generated by Gradle"/>
-            <sha256 value="1b9fbd4f325a71e99b279080d63084f12d884d42081af298f9e553e1fe0cd74a" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.apache.ant" name="ant" version="1.9.9">
          <artifact name="ant-1.9.9.jar">
             <md5 value="03bbb3ac9cef4cea901c11ab10ea1b1a" origin="Generated by Gradle"/>
             <sha256 value="d81254bcb2e170c9ea16cd418050f3340da1736380a02415c8ddda9a0a0b8a1b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ant-1.9.9.pom">
-            <md5 value="90177aafd56b162e5847bd44378f3d09" origin="Generated by Gradle"/>
-            <sha256 value="88886fdd08f339443a5b2d556ac88133569ed51dc1225d96661ad23bdefe1590" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.apache.ant" name="ant-commons-net" version="1.9.9">
          <artifact name="ant-commons-net-1.9.9.jar">
             <md5 value="5c67c97ef3955aa4618ce50cada3f638" origin="Generated by Gradle"/>
             <sha256 value="4df0b5145d05213f4d2e2d930791337d0d260b719f7d94593673390c7a5772ca" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ant-commons-net-1.9.9.pom">
-            <md5 value="71ec6e7157cd2afcf3ccbaacdf7d7f04" origin="Generated by Gradle"/>
-            <sha256 value="ab922994600a8151c6f5d6ed3047406fdf2fa710a11524487af9dafb089572f5" origin="Generated by Gradle"/>
+      </component>
+      <component group="org.apache.ant" name="ant-launcher" version="1.10.11">
+         <artifact name="ant-launcher-1.10.11.jar">
+            <md5 value="be781a9ac23f3b6f16a898d49aa2af0b" origin="Generated by Gradle"/>
+            <sha256 value="dab530df7a980b5ac8fd7e8d208243ae0d3ebd6de09b1aa2ce756360cc2ed256" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.ant" name="ant-launcher" version="1.10.7">
@@ -3823,80 +3775,24 @@
             <md5 value="68e4ba132f8168520087c3d89ca87b2a" origin="Generated by Gradle"/>
             <sha256 value="749d131ab53fd292041245bf24e4b6a6241766f17a5b987a4e4d833cd4234ae6" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ant-launcher-1.10.7.pom">
-            <md5 value="321e32a38c437e2763357809dfb5f605" origin="Generated by Gradle"/>
-            <sha256 value="ac3804433406d5b6308c632388ae4c6504e23fce142c106a9fa9f9a4a6b1e992" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.apache.ant" name="ant-launcher" version="1.7.0">
          <artifact name="ant-launcher-1.7.0.jar">
             <md5 value="e0c8b3f9390a5d784bbdb6a21f2abd1d" origin="Generated by Gradle"/>
             <sha256 value="72b3d03e0d7d86a56513ec38dd4cd6abe3da6620189be222ab255352cb6eba4a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ant-launcher-1.7.0.pom">
-            <md5 value="9715be71f950b5701fca1f863434373d" origin="Generated by Gradle"/>
-            <sha256 value="d29d26cb2906e9c398381bd4873ecabb04d630ef613435ecb149a85a2aefcaf4" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.apache.ant" name="ant-launcher" version="1.8.0">
          <artifact name="ant-launcher-1.8.0.jar">
             <md5 value="4146d8329e1515aceeffafff8a83b9f1" origin="Generated by Gradle"/>
             <sha256 value="da9fd92eacdf63daf0be52eb71accc10ff7943a85d7aac9ea96cf7e03ee3d3cc" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ant-launcher-1.8.0.pom">
-            <md5 value="c98af8201297aeab84f2c287f2258e23" origin="Generated by Gradle"/>
-            <sha256 value="08426143d37d770f3e4dae45b0870c3ab1ba512cb64418f34496025b72d16760" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.ant" name="ant-launcher" version="1.9.7">
-         <artifact name="ant-launcher-1.9.7.jar">
-            <md5 value="f099489fbe6cc9665cb690b4b03cf48c" origin="Generated by Gradle"/>
-            <sha256 value="bc376f6d6cb586229f451ac459faf1443b144c26d6647618ec9cba60e54c2b79" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="ant-launcher-1.9.7.pom">
-            <md5 value="675df083eb5e7c8a2aa00b39194bd1f5" origin="Generated by Gradle"/>
-            <sha256 value="d7bcdd3ab0ff55edbe1b96d06f06dac2135ec63b5a7c32cef3a436b49c9eee27" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.apache.ant" name="ant-launcher" version="1.9.9">
          <artifact name="ant-launcher-1.9.9.jar">
             <md5 value="430b91efb8017b5f45e1f30be05c0055" origin="Generated by Gradle"/>
             <sha256 value="02cbe010ceec4acab059acfa48a16dc7b7c430200f2561b6b7c75bcab48f4044" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ant-launcher-1.9.9.pom">
-            <md5 value="4ae2e4d12aabfa2b5a00dc39fa484b39" origin="Generated by Gradle"/>
-            <sha256 value="371c0979db253300320402a2c5d8615c0ba96362daa7f038640c8fc5d9cbc3f6" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.ant" name="ant-parent" version="1.10.7">
-         <artifact name="ant-parent-1.10.7.pom">
-            <md5 value="e66e7c684d1ae450f2aaa255294c50fa" origin="Generated by Gradle"/>
-            <sha256 value="96c4321589b211fefcd7817515cbf272ff4161c6896b8c1579a8606228040632" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.ant" name="ant-parent" version="1.7.0">
-         <artifact name="ant-parent-1.7.0.pom">
-            <md5 value="bbb2b5106cdfce3220529d77200085cc" origin="Generated by Gradle"/>
-            <sha256 value="1a52d8371a6cbc6e05edbf02646717117dd2344459bee967014f041fdcf30893" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.ant" name="ant-parent" version="1.8.0">
-         <artifact name="ant-parent-1.8.0.pom">
-            <md5 value="40c2c934e10d4d8b8acffa76f99f7cae" origin="Generated by Gradle"/>
-            <sha256 value="ecbd655fd71d298eaf0787045b84324ce68936ad0de98c7a9c55538e539f2747" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.ant" name="ant-parent" version="1.9.7">
-         <artifact name="ant-parent-1.9.7.pom">
-            <md5 value="66beb37e94c356a8a5f3321750158a03" origin="Generated by Gradle"/>
-            <sha256 value="75d2cef64c65ccbdd2faf7261e53b444778d56d338763154e30fada4a41d1215" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.ant" name="ant-parent" version="1.9.9">
-         <artifact name="ant-parent-1.9.9.pom">
-            <md5 value="256ad74f85a0861133757db82f369db5" origin="Generated by Gradle"/>
-            <sha256 value="ce607c6f829e4cf7bfa16651312b11b453921eb6bf400ef0c0be2c8f6eba5e51" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.apache.commons" name="commons-compress" version="1.0">
          <artifact name="commons-compress-1.0.jar">
@@ -4370,30 +4266,16 @@
             <sha256 value="516106ddc6a4fc14445e5ea309710faba423d4591ed7667fff5f8c074ace2f18" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.logging.log4j" name="log4j" version="2.13.3">
-         <artifact name="log4j-2.13.3.pom">
-            <md5 value="cdc805063f461f224ce1a040fd61705e" origin="Generated by Gradle"/>
-            <sha256 value="674f1fa5165b9d48935f4103d9316fe5b161dff6f9be904a6edb9baa33da4480" origin="Generated by Gradle"/>
+      <component group="org.apache.logging.log4j" name="log4j-api" version="2.16.0">
+         <artifact name="log4j-api-2.16.0.jar">
+            <md5 value="ade293913c90e835c2deb56cbfa2229b" origin="Generated by Gradle"/>
+            <sha256 value="cbbcef7b57fef115a788395e6e11cdf92c01c1d606652c493d40d3c81766b9fc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.logging.log4j" name="log4j-api" version="2.13.3">
-         <artifact name="log4j-api-2.13.3.jar">
-            <md5 value="236b9969df6b394e88283a9f813b9b95" origin="Generated by Gradle"/>
-            <sha256 value="2b4b1965c9dce7f3732a0fbf5c8493199c1e6bf8cf65c3e235b57d98da5f36af" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="log4j-api-2.13.3.pom">
-            <md5 value="15695bdb45c3c19d71921e258619e5e9" origin="Generated by Gradle"/>
-            <sha256 value="5953807d4e4fd4d7ae8087b5a76660236e55e718fcad62cf8a7adedc2ddc5a6e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.logging.log4j" name="log4j-core" version="2.13.3">
-         <artifact name="log4j-core-2.13.3.jar">
-            <md5 value="cc7d55ed69cc5fd34035b15c6edf79a0" origin="Generated by Gradle"/>
-            <sha256 value="9529c55814264ab96b0eeba2920ac0805170969c994cc479bd3d4d7eb24a35a8" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="log4j-core-2.13.3.pom">
-            <md5 value="ca196cbc31ae4a9412cea34e77c92a6d" origin="Generated by Gradle"/>
-            <sha256 value="ec5592381a9b37e5054a91fcaf79e3c2c4582eee3574d9ad8a022afbd5b5a3fb" origin="Generated by Gradle"/>
+      <component group="org.apache.logging.log4j" name="log4j-core" version="2.16.0">
+         <artifact name="log4j-core-2.16.0.jar">
+            <md5 value="9f41928a418200de2232dd326e522cc7" origin="Generated by Gradle"/>
+            <sha256 value="5d241620b10e3f1475320bc9552cf7bcfa27eeb9b1b6a891449e76db4b4a02a8" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.maven" name="maven" version="2.2.0">
@@ -5198,157 +5080,53 @@
             <sha256 value="f819cad1b15b6a7791c8b601e96bde33765e4681395807db4537d2f0dedd493b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.codehaus.plexus" name="plexus" version="1.0.4">
-         <artifact name="plexus-1.0.4.pom">
-            <md5 value="2e97f3a7666e337ce5d2d98b9c384cae" origin="Generated by Gradle"/>
-            <sha256 value="2242fd02d12b1ca73267fb3d89863025517200e7a4ee426cba4667d0172c74c3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.codehaus.plexus" name="plexus" version="2.0.2">
-         <artifact name="plexus-2.0.2.pom">
-            <md5 value="05fb342f095c0e476fe41bf4e6969d7e" origin="Generated by Gradle"/>
-            <sha256 value="e246e2a062b5d989fdefc521c9c56431ba5554ff8d2344edee9218a34a546a33" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.codehaus.plexus" name="plexus" version="2.0.7">
-         <artifact name="plexus-2.0.7.pom">
-            <md5 value="48682619d00b91235b124d49ac344f4f" origin="Generated by Gradle"/>
-            <sha256 value="2b59062030ab0a15c5d0977ba22421706368926488739a65f25793e715cc8a74" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.codehaus.plexus" name="plexus" version="3.2">
-         <artifact name="plexus-3.2.pom">
-            <md5 value="70667b9c5721f81f2b16be8fa6f3efed" origin="Generated by Gradle"/>
-            <sha256 value="1c7c732fdc37e7705af76835b1589fedd9db2abe1baa76b16bd061bd7291de4f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.codehaus.plexus" name="plexus" version="3.3.1">
-         <artifact name="plexus-3.3.1.pom">
-            <md5 value="61270df64752b6bae0db647881b1269d" origin="Generated by Gradle"/>
-            <sha256 value="6ec96f889bc29250f90b167c14e547f1b05aa23565c63f9079595befbde816bb" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.codehaus.plexus" name="plexus" version="4.0">
-         <artifact name="plexus-4.0.pom">
-            <md5 value="d3d44db642e2a52f655ff1b794439753" origin="Generated by Gradle"/>
-            <sha256 value="0a1b692d7fcc90d6a45dae2e50f4660d48f7a44504f174aa60ef34fbe1327f6a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.codehaus.plexus" name="plexus" version="5.1">
-         <artifact name="plexus-5.1.pom">
-            <md5 value="24561034d1dbd16a4b13f066a8535eea" origin="Generated by Gradle"/>
-            <sha256 value="a343e44ff5796aed0ea60be11454c935ce20ab1c5f164acc8da574482dcbc7e9" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.codehaus.plexus" name="plexus-classworlds" version="2.4">
          <artifact name="plexus-classworlds-2.4.jar">
             <md5 value="4b6ec19d96af7d901c1aad7d2415d498" origin="Generated by Gradle"/>
             <sha256 value="259d528a29722cab6349d7e7d432e3fd4877c087ffcb04985a6612e97023bba8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="plexus-classworlds-2.4.pom">
-            <md5 value="48016278591e39a0c372a5230fc31e93" origin="Generated by Gradle"/>
-            <sha256 value="c0439c2b2d850488686143e2529f521b38f2abded6ac212add8f0c637eb912e9" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.codehaus.plexus" name="plexus-classworlds" version="2.6.0">
          <artifact name="plexus-classworlds-2.6.0.jar">
             <md5 value="67e722b27e3a33b33c1b263b99dd7c43" origin="Generated by Gradle"/>
             <sha256 value="52f77c5ec49f787c9c417ebed5d6efd9922f44a202f217376e4f94c0d74f3549" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="plexus-classworlds-2.6.0.pom">
-            <md5 value="4d0802615591653182cfc4d442233180" origin="Generated by Gradle"/>
-            <sha256 value="469a6c59f92effa62c0797ce7d52d2c03cf8ee1034b923c360dd78a9f505a7ba" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.codehaus.plexus" name="plexus-component-annotations" version="1.5.5">
          <artifact name="plexus-component-annotations-1.5.5.jar">
             <md5 value="ef37dcdb84030422db428b63c4354e5b" origin="Generated by Gradle"/>
             <sha256 value="4df7a6a7be64b35bbccf60b5c115697f9ea3421d22674ae67135dde375fcca1f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="plexus-component-annotations-1.5.5.pom">
-            <md5 value="f0bcb25d1f10fe87632ce632cc3b8eb7" origin="Generated by Gradle"/>
-            <sha256 value="815f3ec316b8c5fa701385fdf4009bfb51e07d780e8f6a6e2afe720c52d7e292" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.codehaus.plexus" name="plexus-component-annotations" version="2.1.0">
          <artifact name="plexus-component-annotations-2.1.0.jar">
             <md5 value="141fd7a2ae613cb17d25ecd54b43eb3f" origin="Generated by Gradle"/>
             <sha256 value="bde3617ce9b5bcf9584126046080043af6a4b3baea40a3b153f02e7bbc32acac" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="plexus-component-annotations-2.1.0.pom">
-            <md5 value="be69c753789341b846142077b35bd233" origin="Generated by Gradle"/>
-            <sha256 value="0670b605255f7dc9a454daaec7912918ccf1b5475cbfca374363b51fcfd4ea00" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.codehaus.plexus" name="plexus-components" version="1.1.14">
-         <artifact name="plexus-components-1.1.14.pom">
-            <md5 value="87fd7c3a01738e4bb7c748bf4b844e53" origin="Generated by Gradle"/>
-            <sha256 value="381d72c526be217b770f9f8c3f749a86d3b1548ac5c1fcb48d267530ec60d43f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.codehaus.plexus" name="plexus-components" version="1.1.18">
-         <artifact name="plexus-components-1.1.18.pom">
-            <md5 value="7a852d7f0dad799bdc386c25c8325758" origin="Generated by Gradle"/>
-            <sha256 value="ef5dbc7fa918b6dbba71d27e5b3d7a00df624bcfa2549a7297f36fe275f634d7" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.codehaus.plexus" name="plexus-container-default" version="1.0-alpha-9-stable-1">
          <artifact name="plexus-container-default-1.0-alpha-9-stable-1.jar">
             <md5 value="99533a9d3e0fa3280cd0bd3426c5f99b" origin="Generated by Gradle"/>
             <sha256 value="7c758612888782ccfe376823aee7cdcc7e0cdafb097f7ef50295a0b0c3a16edf" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="plexus-container-default-1.0-alpha-9-stable-1.pom">
-            <md5 value="708fdd862e8fb8b04779489c1cb13761" origin="Generated by Gradle"/>
-            <sha256 value="ef71d45a49edfe76be0f520312a76bc2aae73ec0743a5ffffe10d30122c6e2b2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.codehaus.plexus" name="plexus-containers" version="1.0.3">
-         <artifact name="plexus-containers-1.0.3.pom">
-            <md5 value="8e315f81dd1a94950f8d881a04026519" origin="Generated by Gradle"/>
-            <sha256 value="7c75075badcb014443ee94c8c4cad2f4a9905be3ce9430fe7b220afc7fa3a80f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.codehaus.plexus" name="plexus-containers" version="1.5.5">
-         <artifact name="plexus-containers-1.5.5.pom">
-            <md5 value="19f633364c9e7b5ea62938e42d51d62d" origin="Generated by Gradle"/>
-            <sha256 value="1bc264824ec876b0ca6f4f5838175c541c638cbc43326a268b9aee7d4778b5ef" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.codehaus.plexus" name="plexus-containers" version="2.1.0">
-         <artifact name="plexus-containers-2.1.0.pom">
-            <md5 value="83d766a21f5e157eb7119fae7500314e" origin="Generated by Gradle"/>
-            <sha256 value="94d5aedb3c46023265396527cf8ce7fc944b7bd79e4ebab907386418eb5a08d7" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.codehaus.plexus" name="plexus-interpolation" version="1.11">
          <artifact name="plexus-interpolation-1.11.jar">
             <md5 value="d5ef768cef9a261d569ff1f672324154" origin="Generated by Gradle"/>
             <sha256 value="fd9507feb858fa620d1b4aa4b7039fdea1a77e09d3fd28cfbddfff468d9d8c28" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="plexus-interpolation-1.11.pom">
-            <md5 value="56a80ed63c40350b009d04f44398e698" origin="Generated by Gradle"/>
-            <sha256 value="b84d281f59b9da528139e0752a0e1cab0bd98d52c58442b00e45c9748e1d9eee" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.codehaus.plexus" name="plexus-interpolation" version="1.14">
          <artifact name="plexus-interpolation-1.14.jar">
             <md5 value="f92db8b194fc417d72cc74c428afacf8" origin="Generated by Gradle"/>
             <sha256 value="7fc63378d3e84663619b9bedace9f9fe78b276c2be3c62ca2245449294c84176" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="plexus-interpolation-1.14.pom">
-            <md5 value="ea82b7caf7ea4d6794a2345c5f459c5b" origin="Generated by Gradle"/>
-            <sha256 value="d08155c497df37b2c3d9b5b0dfdb02ec0525b2070b5be3739fffde942fcac9af" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.codehaus.plexus" name="plexus-interpolation" version="1.25">
          <artifact name="plexus-interpolation-1.25.jar">
             <md5 value="86cc99a26f3b3caa0fc2c8c77f4c03b0" origin="Generated by Gradle"/>
             <sha256 value="e003802501574637f7abdc4e83e6d509a31e9ff825d12da6d1e419acf9688705" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="plexus-interpolation-1.25.pom">
-            <md5 value="da92a0421640572af9534f67e850531f" origin="Generated by Gradle"/>
-            <sha256 value="9eb551c0ca3ec1354f10bbc5a037a89809d4e32bac9f55a4431e4be0eb8f0d8f" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="org.codehaus.plexus" name="plexus-utils" version="1.5.15">
          <artifact name="plexus-utils-1.5.15.jar">
@@ -5356,30 +5134,24 @@
             <sha256 value="2ca121831e597b4d8f2cb22d17c5c041fc23a7777ceb6bfbdd4dfb34bbe7d997" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.codehaus.plexus" name="plexus-utils" version="3.0.24">
-         <artifact name="plexus-utils-3.0.24.jar">
-            <md5 value="fbefd8983c6bb4928c27c680463ff355" origin="Generated by Gradle"/>
-            <sha256 value="83ee748b12d06afb0ad4050a591132b3e8025fbb1990f1ed002e8b73293e69b4" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.codehaus.plexus" name="plexus-utils" version="3.0.8">
          <artifact name="plexus-utils-3.0.8.jar">
             <md5 value="9a74909890fdeb93333409442c62b54f" origin="Generated by Gradle"/>
             <sha256 value="6c040032841fe6b23612c7a4b52347a4a115fdde748086c399a154b4b108e56b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.codehaus.plexus" name="plexus-utils" version="3.2.1">
-         <artifact name="plexus-utils-3.2.1.jar">
-            <md5 value="a1b7cb2baeae4bb4c3a016417d5d3cb0" origin="Generated by Gradle"/>
-            <sha256 value="8d07b497bb8deb167ee5329cae87ef2043833bf52e4f15a5a9379cec447a5b2b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.codehaus.plexus" name="plexus-utils" version="3.3.0">
          <artifact name="plexus-utils-3.3.0.jar">
             <md5 value="3ae76ff0195ada460d495efe1fb50d17" origin="Generated by Gradle"/>
             <sha256 value="76d174792540e2775af94d03d10fb2d3c776e2cd0ac0ebf427d3e570072bb9ce" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.plexus" name="plexus-utils" version="3.4.1">
+         <artifact name="plexus-utils-3.4.1.jar">
+            <md5 value="c155c4135ef7ba134659bf1af31c5156" origin="Generated by Gradle"/>
+            <sha256 value="52d85e04b3918722af11d12855b4a8257df96a0e76c8f4e3852e6faa851f357b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.woodstox" name="stax2-api" version="4.2.1">
          <artifact name="stax2-api-4.2.1.jar">
             <md5 value="af8377bc7882332e22456616a9f164f6" origin="Generated by Gradle"/>
@@ -7479,6 +7251,12 @@
             <sha256 value="8af81096ed3affa39a4729fc900a55b663894911d67c4d4bef0ea424393dd3f9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm" version="9.2">
+         <artifact name="asm-9.2.jar">
+            <md5 value="8f184dce9b1bedc675d4a3640d43ddf0" origin="Generated by Gradle"/>
+            <sha256 value="b9d4fe4d71938df38839f0eca42aaaa64cf8b313d678da036f0cb3ca199b47f5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ow2.asm" name="asm-analysis" version="5.1">
          <artifact name="asm-analysis-5.1.jar">
             <md5 value="715c14ba7488f1312cf9fd2944326e18" origin="Generated by Gradle"/>
@@ -7515,6 +7293,12 @@
             <sha256 value="6e02aafb4637979c7cdc3daa3047a88b40f3e1071bdbbd0c7f1cd5da7ac38454" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm-analysis" version="9.2">
+         <artifact name="asm-analysis-9.2.jar">
+            <md5 value="e62aa59de96ae29c690c3521ea4b6359" origin="Generated by Gradle"/>
+            <sha256 value="878fbe521731c072d14d2d65b983b1beae6ad06fda0007b6a8bae81f73f433c4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ow2.asm" name="asm-commons" version="5.1">
          <artifact name="asm-commons-5.1.jar">
             <md5 value="38839fb32c40f7f70986e9c282de0018" origin="Generated by Gradle"/>
@@ -7555,6 +7339,12 @@
             <sha256 value="58880e03e9196f566c998186f58bd0af41c77a04ba841664f80377ba0665f97c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm-commons" version="9.2">
+         <artifact name="asm-commons-9.2.jar">
+            <md5 value="3eb09775e1076eb0a085a4592faebc2a" origin="Generated by Gradle"/>
+            <sha256 value="be4ce53138a238bb522cd781cf91f3ba5ce2f6ca93ec62d46a162a127225e0a6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ow2.asm" name="asm-parent" version="5.0.3">
          <artifact name="asm-parent-5.0.3.pom">
             <md5 value="e0ef75ada6aa6a9c47498fa357120b26" origin="Generated by Gradle"/>
@@ -7613,6 +7403,12 @@
             <sha256 value="b38cbdd2c47fa4f29ab680c18954c7216d0afd28692221cd288c1cc7b9d9641c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm-tree" version="9.2">
+         <artifact name="asm-tree-9.2.jar">
+            <md5 value="9c45524e94b19cc8b614b9e81ad544e2" origin="Generated by Gradle"/>
+            <sha256 value="aabf9bd23091a4ebfc109c1f3ee7cf3e4b89f6ba2d3f51c5243f16b3cffae011" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ow2.asm" name="asm-util" version="5.1">
          <artifact name="asm-util-5.1.jar">
             <md5 value="99531cb1da6e5aa4f9f0e74313e3c5e9" origin="Generated by Gradle"/>
@@ -8255,14 +8051,10 @@
             <sha256 value="d035317c845ff6828b8209bfb8b62f81f21b753a533f355f327abb9d7c9d3ab6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.vafer" name="jdependency" version="2.1.1">
-         <artifact name="jdependency-2.1.1.jar">
-            <md5 value="bbd163a7670bef2d124a93e582b8ef3d" origin="Generated by Gradle"/>
-            <sha256 value="642d23a86217850721d9fa80671683d8308fd03114f0da7af553d43b82013a09" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="jdependency-2.1.1.pom">
-            <md5 value="c2ab443501ff25671bf95e93132d7c8f" origin="Generated by Gradle"/>
-            <sha256 value="4a139306cbe0aa3765bd9fd837a71253a911a9c4e55c50e062a4bd6843ee19a1" origin="Generated by Gradle"/>
+      <component group="org.vafer" name="jdependency" version="2.7.0">
+         <artifact name="jdependency-2.7.0.jar">
+            <md5 value="acb280b77d02fda6e3441cf72cd907de" origin="Generated by Gradle"/>
+            <sha256 value="d63efd5746ff408943a7dd7ef85ae9f09aa7fb63bb2b16911427ce6c45b59fd0" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.yaml" name="snakeyaml" version="1.24">

gradle/versions.properties

@@ -24,7 +24,7 @@ versions.lz4-java=1.7.1
 versions.org.junit.platform=1.7.0
 versions.oro=2.0.8
 versions.serviceMessages=2019.1.4
-versions.shadow=6.1.0
+versions.shadow=7.1.1
 versions.streamex=0.7.2
 versions.trove4j=1.0.20200330
 

kotlin-native/build-tools/build.gradle.kts

@@ -56,7 +56,7 @@ dependencies {
 
     // Located in <repo root>/shared and always provided by the composite build.
     api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion")
-    implementation("com.github.jengelman.gradle.plugins:shadow:$shadowVersion")
+    implementation("gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion")
 
     implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
 }

kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CollisionTransformer.kt

@@ -14,10 +14,12 @@ import shadow.org.apache.commons.io.IOUtils
 import shadow.org.apache.tools.zip.ZipEntry
 import shadow.org.apache.tools.zip.ZipFile
 
-class CollisionTransformer: Transformer {
+class CollisionTransformer : Transformer {
     var resolvedConflicts = mutableMapOf<String, File>()
     private val foundConflictsFiles = mutableSetOf<String>()
 
+    override fun getName() = "CollisionTransformer"
+
     override fun canTransformResource(element: FileTreeElement): Boolean  {
         val result = element.name in resolvedConflicts.keys
         if (result) {

kotlin-native/build.gradle

@@ -41,11 +41,12 @@ buildscript {
             mavenCentral()
             jcenter()
         }
+        gradlePluginPortal()
     }
 
     dependencies {
         //classpath project(":kotlin-native-utils")
-        classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
+        classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.1'
     }
 }
 import org.jetbrains.kotlin.konan.*

kotlin-native/gradle.properties

@@ -31,7 +31,7 @@ org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 org.gradle.workers.max=4
 slackApiVersion=1.2.0
 ktorVersion=1.2.1
-shadowVersion=5.1.0
+shadowVersion=7.1.1
 metadataVersion=0.0.1-dev-10
 
 kotlinNativeVersionInResources=true

kotlin-native/performance/buildSrc/build.gradle.kts

@@ -89,7 +89,7 @@ dependencies {
     val kotlinVersion = project.bootstrapKotlinVersion
     val ktorVersion  = "1.2.1"
     val slackApiVersion = "1.2.0"
-    val shadowVersion = "5.1.0"
+    val shadowVersion = "7.1.1"
     val metadataVersion = "0.0.1-dev-10"
 
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
@@ -105,7 +105,7 @@ dependencies {
 
     // Located in <repo root>/shared and always provided by the composite build.
     //api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion")
-    implementation("com.github.jengelman.gradle.plugins:shadow:$shadowVersion")
+    implementation("gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion")
 
     implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
 }

kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts

@@ -90,7 +90,7 @@ dependencies {
     val kotlinVersion = project.bootstrapKotlinVersion
     val ktorVersion = "1.2.1"
     val slackApiVersion = "1.2.0"
-    val shadowVersion = "5.1.0"
+    val shadowVersion = "7.1.1"
     val metadataVersion = "0.0.1-dev-10"
 
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
@@ -106,7 +106,7 @@ dependencies {
 
     // Located in <repo root>/shared and always provided by the composite build.
     //api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion")
-    implementation("com.github.jengelman.gradle.plugins:shadow:$shadowVersion")
+    implementation("gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
 }
 

kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle

@@ -34,7 +34,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4'
+        classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.1'
         classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
     }
 }

kotlin-native/tools/performance-server/buildSrc/build.gradle.kts

@@ -88,7 +88,7 @@ dependencies {
     val kotlinVersion = project.bootstrapKotlinVersion
     val ktorVersion = "1.2.1"
     val slackApiVersion = "1.2.0"
-    val shadowVersion = "5.1.0"
+    val shadowVersion = "7.1.1"
     val metadataVersion = "0.0.1-dev-10"
 
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
@@ -104,6 +104,6 @@ dependencies {
 
     // Located in <repo root>/shared and always provided by the composite build.
     //api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion")
-    implementation("com.github.jengelman.gradle.plugins:shadow:$shadowVersion")
+    implementation("gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
 }

kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts

@@ -86,7 +86,7 @@ dependencies {
     val kotlinVersion = project.bootstrapKotlinVersion
     val ktorVersion = "1.2.1"
     val slackApiVersion = "1.2.0"
-    val shadowVersion = "5.1.0"
+    val shadowVersion = "7.1.1"
     val metadataVersion = "0.0.1-dev-10"
 
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
@@ -102,6 +102,6 @@ dependencies {
 
     // Located in <repo root>/shared and always provided by the composite build.
     //api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion")
-    implementation("com.github.jengelman.gradle.plugins:shadow:$shadowVersion")
+    implementation("gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
 }

libraries/reflect/build.gradle.kts

@@ -65,6 +65,8 @@ class KotlinModuleShadowTransformer(private val logger: Logger) : Transformer {
     private data class Entry(val path: String, val bytes: ByteArray)
     private val data = mutableListOf<Entry>()
 
+    override fun getName() = "KotlinModuleShadowTransformer"
+
     override fun canTransformResource(element: FileTreeElement): Boolean =
             element.path.substringAfterLast(".") == KOTLIN_MODULE
 

plugins/pill/pill-importer/build.gradle.kts

@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.pill.PillExtension
 import java.lang.reflect.Modifier
 import java.net.URLClassLoader
 
@@ -7,11 +6,15 @@ plugins {
     id("jps-compatible")
 }
 
+repositories {
+    gradlePluginPortal()
+}
+
 dependencies {
     compileOnly(kotlin("stdlib", embeddedKotlinVersion))
     compileOnly(gradleApi())
     compileOnly(gradleKotlinDsl())
-    compileOnly("com.github.jengelman.gradle.plugins:shadow:${rootProject.extra["versions.shadow"]}")
+    compileOnly("gradle.plugin.com.github.johnrengelman:shadow:${rootProject.extra["versions.shadow"]}")
 }
 
 sourceSets {