From 068779f850fe2aff41fd2b18f5f425a075c34d0c Mon Sep 17 00:00:00 2001 From: Bogdan Mukvich Date: Mon, 17 Jun 2024 16:17:14 +0200 Subject: [PATCH] Build: update shadow to 8.1.7 Use new shadow fork, since original shadow development discontinued see: https://github.com/johnrengelman/shadow/issues/908 ^KTI-1456 --- gradle/libs.versions.toml | 4 +- gradle/verification-metadata.xml | 100 ++++++++++-------- kotlin-native/build.gradle | 2 +- .../performance/buildSrc/build.gradle.kts | 4 +- .../buildSrc/build.gradle.kts | 2 +- .../buildSrc/build.gradle.kts | 4 +- .../ui/buildSrc/build.gradle.kts | 4 +- .../kotlin/gradle/mpp/MppJvmWithJavaIT.kt | 4 +- .../kotlin/gradle/testbase/TestVersions.kt | 2 +- 9 files changed, 69 insertions(+), 57 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 57bb811b056f2..23c167b462c54 100644 --- 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 index 12684c45dfac3..a9a379e4b1eb7 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -809,12 +809,6 @@ - - - - - - @@ -1917,6 +1911,12 @@ + + + + + + @@ -2763,10 +2763,10 @@ - - - - + + + + @@ -2817,10 +2817,10 @@ - - - - + + + + @@ -3015,16 +3015,16 @@ - - - - + + + + - - - - + + + + @@ -3033,6 +3033,18 @@ + + + + + + + + + + + + @@ -3219,6 +3231,12 @@ + + + + + + @@ -3705,6 +3723,18 @@ + + + + + + + + + + + + @@ -5091,12 +5121,6 @@ - - - - - - @@ -5115,12 +5139,6 @@ - - - - - - @@ -5139,12 +5157,6 @@ - - - - - - @@ -5337,10 +5349,10 @@ - - - - + + + + diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle index f085adfba3558..0c93a90d7af8f 100644 --- 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 index 629ec2c0bc687..3fce87139ea35 100644 --- 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 /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 index d0b91f3456200..e626d8f7affab 100644 --- 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 /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 index 60c5d4be595f0..1bcf61ad0d2de 100644 --- 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 /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 index 3b6163aa9e6f6..e3309bedf48fd 100644 --- 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 /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/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppJvmWithJavaIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppJvmWithJavaIT.kt index e3ed819013736..927e4f493a838 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppJvmWithJavaIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-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/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt index 47522a48e62a4..3c7f668c68cda 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt +++ b/libraries/tools/kotlin-gradle-plugin-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"