Build: update shadow to 8.1.7

Use new shadow fork, since original shadow development discontinued see: GradleUp/shadow#908 ^KTI-1456
JetBrains · Jun 21, 2024 · 068779f · 068779f
1 parent f9ec5f5
commit 068779f
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 57 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ kotlinx-serialization = "1.5.0"
 # Version of the coroutines should be aligned with the oldest supported IntelliJ IDEA. Intellij IDEA uses 1.6 since 2022.3
 # Check the version in this file: https://github.com/JetBrains/intellij-community/blob/cc37866d3827c51712f9856f5e580d405784d1ef/.idea/libraries/kotlinx_coroutines_core.xml
 kotlinx-coroutines = "1.6.4"
-shadow = "8.1.1" # Should be in sync with version in kotlin-native/
+shadow = "8.1.7" # Should be in sync with version in kotlin-native/
 spdx = "0.8.0-dev-14"
 proguard = "7.4.2"
 ktor = "2.3.7"
@@ -49,7 +49,7 @@ kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-c
 kotlinx-coroutines-core-jvm = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version.ref = "kotlinx-coroutines" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
 kotlinx-metadataJvm = { module = "org.jetbrains.kotlinx:kotlinx-metadata-jvm", version.ref = "kotlinx-metadataJvm" }
-shadow-gradlePlugin = { module = "com.github.johnrengelman:shadow", version.ref = "shadow" }
+shadow-gradlePlugin = { module = "io.github.goooler.shadow:shadow-gradle-plugin", version.ref = "shadow" }
 spdx-gradlePlugin = { module = "org.spdx:spdx-gradle-plugin", version.ref = "spdx" }
 proguard-gradlePlugin = { module = "com.guardsquare:proguard-gradle", version.ref = "proguard" }
 

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -809,12 +809,6 @@
             <sha256 value="997bd35e15810336962b8165c16183ba0e45171ee3e61ab9d077bed36a73e0f3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.github.johnrengelman" name="shadow" version="8.1.1">
-         <artifact name="shadow-8.1.1.jar">
-            <md5 value="6ea9d2d82b534e08e692a505d2b7c373" origin="Generated by Gradle"/>
-            <sha256 value="084197555590a53bb21b59508a3330559f536ddb448eafd1ec675f5462036fcf" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.github.kittinunf.fuel" name="fuel" version="2.3.1">
          <artifact name="fuel-2.3.1.jar">
             <md5 value="7c18f0d573486d36acc0597f6b3b3c88" origin="Generated by Gradle"/>
@@ -1917,6 +1911,12 @@
             <sha256 value="b0a5159e926de8084ff066025142270443533656bc599b8bb31d14d11fd138a4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.github.goooler.shadow" name="shadow-gradle-plugin" version="8.1.7">
+         <artifact name="shadow-gradle-plugin-8.1.7.jar">
+            <md5 value="d7e815f06b9450db167eb26783302920" origin="Generated by Gradle"/>
+            <sha256 value="8f2267ef1cbb65e55c45f972422fbc011cae68a02bb4d68d4011f66f7590eea5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.grpc" name="grpc-api" version="1.39.0">
          <artifact name="grpc-api-1.39.0.jar">
             <md5 value="67d66d78ccd77947669d5fdd283110e8" origin="Generated by Gradle"/>
@@ -2763,10 +2763,10 @@
             <sha256 value="5c6a438c3ebe7a306eba452b09fa307b0e60314926177920bca896c4a504eaf6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.ant" name="ant" version="1.10.13">
-         <artifact name="ant-1.10.13.jar">
-            <md5 value="0781dacdb3a7af3a1c1f6d5187438da4" origin="Generated by Gradle"/>
-            <sha256 value="befbfc79e744e9892cfa7db96df3b6e82dc17d2571af42aa427976fc22299838" origin="Generated by Gradle"/>
+      <component group="org.apache.ant" name="ant" version="1.10.14">
+         <artifact name="ant-1.10.14.jar">
+            <md5 value="263e00d844d0e4efa54440ec5ed6362a" origin="Generated by Gradle"/>
+            <sha256 value="4cbbd9243de4c1042d61d9a15db4c43c90ff93b16d78b39481da1c956c8e9671" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.ant" name="ant" version="1.10.7">
@@ -2817,10 +2817,10 @@
             <sha256 value="42a7ca7e7bb777fe7ee75a5ed4cc529c766bc43486367fdaad0ab4a32ee9c249" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.ant" name="ant-launcher" version="1.10.13">
-         <artifact name="ant-launcher-1.10.13.jar">
-            <md5 value="a52f8633aa56da6d33493def13829f3d" origin="Generated by Gradle"/>
-            <sha256 value="cd7695b3bfb6964ab71b6a0b31dad60005ae77fe502132364679aacf08f77970" origin="Generated by Gradle"/>
+      <component group="org.apache.ant" name="ant-launcher" version="1.10.14">
+         <artifact name="ant-launcher-1.10.14.jar">
+            <md5 value="0e6c71b2f05383e1fb891e99f5267663" origin="Generated by Gradle"/>
+            <sha256 value="f0909725a7a24e393888f3fbb558347abf506ce2f7ebc581ff26331b94d951a5" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.ant" name="ant-launcher" version="1.10.7">
@@ -3015,16 +3015,16 @@
             <sha256 value="09351b5a03828f369cdcff76f4ed39e6a6fc20f24f046935d0b28ef5152f8ce4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.logging.log4j" name="log4j-api" version="2.20.0">
-         <artifact name="log4j-api-2.20.0.jar">
-            <md5 value="f9446464667f0139b839b5e9da37f5b9" origin="Generated by Gradle"/>
-            <sha256 value="2f43eea679ea66f14ca0f13fec2a8600ac124f5a5231dcb4df8393eddcb97550" origin="Generated by Gradle"/>
+      <component group="org.apache.logging.log4j" name="log4j-api" version="2.23.0">
+         <artifact name="log4j-api-2.23.0.jar">
+            <md5 value="a548aa8b827a461842f7602384d36822" origin="Generated by Gradle"/>
+            <sha256 value="ff1a58a39df66d55534de744eb97225d4f7665482e73988a496681f5f2744938" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.logging.log4j" name="log4j-core" version="2.20.0">
-         <artifact name="log4j-core-2.20.0.jar">
-            <md5 value="20bd40d026d35a93fe710acb141e93da" origin="Generated by Gradle"/>
-            <sha256 value="6137df848cdaed9f4d5076f75513c6c85da80b953f4e7acca38098b770763f55" origin="Generated by Gradle"/>
+      <component group="org.apache.logging.log4j" name="log4j-core" version="2.23.0">
+         <artifact name="log4j-core-2.23.0.jar">
+            <md5 value="d771856ad69fd530e42778a4d18b2d32" origin="Generated by Gradle"/>
+            <sha256 value="0fef441ee938719f635db7ef21ad5b1ddf7d5bf8f5abf5eca8f29c3f432681db" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.maven" name="maven-ant-tasks" version="2.1.3">
@@ -3033,6 +3033,18 @@
             <sha256 value="f16b5ea711dfe0323454b880180aa832420ec039936e4aa75fb978748634808a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.maven" name="maven-api-meta" version="4.0.0-alpha-9">
+         <artifact name="maven-api-meta-4.0.0-alpha-9.jar">
+            <md5 value="a6ba88c6145aa21ed3360c633fb3746c" origin="Generated by Gradle"/>
+            <sha256 value="32c4f5cadbab680c34952f9cb570457a1383ccec4c9a57b0392607d7191c6949" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.maven" name="maven-api-xml" version="4.0.0-alpha-9">
+         <artifact name="maven-api-xml-4.0.0-alpha-9.jar">
+            <md5 value="3578da899bfa57dfb269b0ef04f6059d" origin="Generated by Gradle"/>
+            <sha256 value="29b2628d0f028119715916849c19eed45b32cdc67eb13551798c73afa4aa23d6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.maven" name="maven-artifact" version="2.2.1">
          <artifact name="maven-artifact-2.2.1.jar">
             <md5 value="7b7613fd5db72967269abe7ab50b76e9" origin="Generated by Gradle"/>
@@ -3219,6 +3231,12 @@
             <sha256 value="2cd3d9d10e8486b29d46ef436dc96bbbfaf435a45dd328ccf955f5af969c8abe" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.maven" name="maven-xml-impl" version="4.0.0-alpha-9">
+         <artifact name="maven-xml-impl-4.0.0-alpha-9.jar">
+            <md5 value="2bf5500ff3f58cf1af9d7c2a2d96cfc8" origin="Generated by Gradle"/>
+            <sha256 value="26e702b881d57ae4ee88d02c00940ba64063705ee69205ae8958bf839a8b06b1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.maven.resolver" name="maven-resolver-api" version="1.6.3">
          <artifact name="maven-resolver-api-1.6.3.jar">
             <md5 value="c1f8b0046b6219ef49dbd73638ce33e2" origin="Generated by Gradle"/>
@@ -3705,6 +3723,18 @@
             <sha256 value="86e0255d4c879c61b4833ed7f13124e8bb679df47debb127326e7db7dd49a07b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.plexus" name="plexus-utils" version="4.0.0">
+         <artifact name="plexus-utils-4.0.0.jar">
+            <md5 value="16481d9d3af602d73a6355e79d2de889" origin="Generated by Gradle"/>
+            <sha256 value="270cd703b48c6e5c8c691f1875f22d62d22cfe072c73ae2f5814d83d68c1da0b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.plexus" name="plexus-xml" version="4.0.3">
+         <artifact name="plexus-xml-4.0.3.jar">
+            <md5 value="44298e1657e1255157891cb470361eef" origin="Generated by Gradle"/>
+            <sha256 value="7aa59e6fd693b8617c87276aeca9e7a149a10bda960788893b94d8a5470373f7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.woodstox" name="stax2-api" version="4.2">
          <artifact name="stax2-api-4.2.jar">
             <md5 value="5d22fe6dbb276d1fd6dab40c386a4f0a" origin="Generated by Gradle"/>
@@ -5091,12 +5121,6 @@
             <sha256 value="b9d4fe4d71938df38839f0eca42aaaa64cf8b313d678da036f0cb3ca199b47f5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.ow2.asm" name="asm" version="9.4">
-         <artifact name="asm-9.4.jar">
-            <md5 value="ffa64f03a23a4823d98703e6ce6ff397" origin="Generated by Gradle"/>
-            <sha256 value="39d0e2b3dc45af65a09b097945750a94a126e052e124f93468443a1d0e15f381" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.ow2.asm" name="asm" version="9.6">
          <artifact name="asm-9.6.jar">
             <md5 value="6f8bccf756f170d4185bb24c8c2d2020" origin="Generated by Gradle"/>
@@ -5115,12 +5139,6 @@
             <sha256 value="f1bce5c648a96a017bdcd01fe5d59af9845297fd7b79b81c015a6fbbd9719abf" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.ow2.asm" name="asm-commons" version="9.4">
-         <artifact name="asm-commons-9.4.jar">
-            <md5 value="bf0034c3d79a244121380da0308c5ec8" origin="Generated by Gradle"/>
-            <sha256 value="0c128a9ec3f33c98959272f6d16cf14247b508f58951574bcdbd2b56d6326364" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.ow2.asm" name="asm-commons" version="9.6">
          <artifact name="asm-commons-9.6.jar">
             <md5 value="9e317c75534bd1da8c00a67c618ab288" origin="Generated by Gradle"/>
@@ -5139,12 +5157,6 @@
             <sha256 value="aabf9bd23091a4ebfc109c1f3ee7cf3e4b89f6ba2d3f51c5243f16b3cffae011" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.ow2.asm" name="asm-tree" version="9.4">
-         <artifact name="asm-tree-9.4.jar">
-            <md5 value="664a67683cc12753e69fce43af328204" origin="Generated by Gradle"/>
-            <sha256 value="c42d479cf24566a21eb20af7eeaeef4e86bdb4a886306cf72f483b65e75b2acf" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.ow2.asm" name="asm-tree" version="9.6">
          <artifact name="asm-tree-9.6.jar">
             <md5 value="6062608f1a98afe1e853d01fa1221a9e" origin="Generated by Gradle"/>
@@ -5337,10 +5349,10 @@
             <sha256 value="a5ac92d2362ccb3a509abe68e385ca809a7c96fcbaf851b3ee8bacb2ac899e2f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.vafer" name="jdependency" version="2.8.0">
-         <artifact name="jdependency-2.8.0.jar">
-            <md5 value="c7bb2436eaa4cf7d9067dfc5c8250bf6" origin="Generated by Gradle"/>
-            <sha256 value="bfd2cc7e1bfc78aa83b44c0a54bf2cde38a4382ec24728af683d98dc6be78192" origin="Generated by Gradle"/>
+      <component group="org.vafer" name="jdependency" version="2.10">
+         <artifact name="jdependency-2.10.jar">
+            <md5 value="c448369187e7e0dfbfb0e801646519b7" origin="Generated by Gradle"/>
+            <sha256 value="1dcd8355ab9ebced687715bf1252eb2aee5d0e74497a2014fd3387cfce8df85f" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.webjars" name="jquery" version="3.5.1">

diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle
@@ -40,7 +40,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.github.johnrengelman:shadow:8.1.1'
+        classpath libs.shadow.gradlePlugin
     }
 }
 

diff --git a/kotlin-native/performance/buildSrc/build.gradle.kts b/kotlin-native/performance/buildSrc/build.gradle.kts
@@ -63,7 +63,7 @@ dependencies {
     val kotlinVersion = project.bootstrapKotlinVersion
     val ktorVersion  = "1.2.1"
     val slackApiVersion = "1.2.0"
-    val shadowVersion = "8.1.1"
+    val shadowVersion = "8.1.7"
     val metadataVersion = "0.0.1-dev-10"
 
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
@@ -79,7 +79,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.johnrengelman:shadow:$shadowVersion")
+    implementation("io.github.goooler.shadow:shadow-gradle-plugin:$shadowVersion")
 
     implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
 }

diff --git a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts
@@ -86,7 +86,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.johnrengelman:shadow:$shadowVersion")
+    implementation("io.github.goooler.shadow:shadow-gradle-plugin:$shadowVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
 }
 

diff --git a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts
@@ -69,7 +69,7 @@ dependencies {
     val kotlinVersion = project.bootstrapKotlinVersion
     val ktorVersion = "1.2.1"
     val slackApiVersion = "1.2.0"
-    val shadowVersion = "8.1.1"
+    val shadowVersion = "8.1.7"
     val metadataVersion = "0.0.1-dev-10"
 
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
@@ -85,6 +85,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.johnrengelman:shadow:$shadowVersion")
+    implementation("io.github.goooler.shadow:shadow-gradle-plugin:$shadowVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
 }
diff --git a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts
@@ -68,7 +68,7 @@ dependencies {
     val kotlinVersion = project.bootstrapKotlinVersion
     val ktorVersion = "1.2.1"
     val slackApiVersion = "1.2.0"
-    val shadowVersion = "8.1.1"
+    val shadowVersion = "8.1.7"
     val metadataVersion = "0.0.1-dev-10"
 
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
@@ -84,6 +84,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.johnrengelman:shadow:$shadowVersion")
+    implementation("io.github.goooler.shadow:shadow-gradle-plugin:$shadowVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
 }
diff --git a/...gin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppJvmWithJavaIT.kt b/...gin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppJvmWithJavaIT.kt
@@ -68,7 +68,7 @@ class MppJvmWithJavaIT : KGPBaseTest() {
                 buildString {
                     appendLine(
                         """
-                        |apply plugin: 'com.github.johnrengelman.shadow'
+                        |apply plugin: 'io.github.goooler.shadow'
                         |apply plugin: 'application'
                         |apply plugin: 'kotlin-kapt' // Check that Kapt works, generates and compiles sources
                         """.trimMargin()
@@ -99,7 +99,7 @@ class MppJvmWithJavaIT : KGPBaseTest() {
                         |        maven { url 'https://plugins.gradle.org/m2/' }
                         |    }
                         |    dependencies {
-                        |        classpath 'com.github.johnrengelman:shadow:${TestVersions.ThirdPartyDependencies.SHADOW_PLUGIN_VERSION}'
+                        |        classpath 'io.github.goooler.shadow:shadow-gradle-plugin:${TestVersions.ThirdPartyDependencies.SHADOW_PLUGIN_VERSION}'
                         |    }
                         |}
                         |

diff --git a/...in-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt b/...in-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt
@@ -93,7 +93,7 @@ interface TestVersions {
     }
 
     object ThirdPartyDependencies {
-        const val SHADOW_PLUGIN_VERSION = "8.1.1"
+        const val SHADOW_PLUGIN_VERSION = "8.1.7"
         const val GOOGLE_DAGGER = "2.24"
         const val GRADLE_ENTERPRISE_PLUGIN_VERSION = "3.13.4"
         const val KOTLINX_ATOMICFU = "0.23.2"