From 85521f01f862de48bfa37f81af8fac8dfbbd8931 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 17 Dec 2021 14:40:33 +0300 Subject: [PATCH] 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 | 2 +- ...ComponentsXmlResourceTransformerPatched.kt | 4 +- gradle/verification-metadata.xml | 338 ++++-------------- gradle/versions.properties | 2 +- kotlin-native/build-tools/build.gradle.kts | 2 +- .../jetbrains/kotlin/CollisionTransformer.kt | 4 +- kotlin-native/build.gradle | 3 +- kotlin-native/gradle.properties | 2 +- .../performance/buildSrc/build.gradle.kts | 4 +- .../buildSrc/build.gradle.kts | 4 +- .../kotlin-native-gradle-plugin/build.gradle | 2 +- .../buildSrc/build.gradle.kts | 4 +- .../ui/buildSrc/build.gradle.kts | 4 +- libraries/reflect/build.gradle.kts | 2 + plugins/pill/pill-importer/build.gradle.kts | 7 +- 15 files changed, 93 insertions(+), 291 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 147698016f3..92b6454a370 100644 --- a/buildSrc/build.gradle.kts +++ b/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") diff --git a/buildSrc/src/main/kotlin/ComponentsXmlResourceTransformerPatched.kt b/buildSrc/src/main/kotlin/ComponentsXmlResourceTransformerPatched.kt index d19f4379afb..7f8cdf84b38 100644 --- a/buildSrc/src/main/kotlin/ComponentsXmlResourceTransformerPatched.kt +++ b/buildSrc/src/main/kotlin/ComponentsXmlResourceTransformerPatched.kt @@ -29,6 +29,8 @@ class ComponentsXmlResourceTransformerPatched : Transformer { private val components: MutableMap = LinkedHashMap() + 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() } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index f6fab1def03..50a00c387b2 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1305,20 +1305,6 @@ - - - - - - - - - - - - - - @@ -2505,45 +2491,23 @@ + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2717,6 +2681,12 @@ + + + + + + @@ -3758,64 +3728,46 @@ + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -3823,80 +3775,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4370,30 +4266,16 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - + + + + @@ -5198,157 +5080,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5356,30 +5134,24 @@ - - - - - - - - - - - - + + + + + + @@ -7479,6 +7251,12 @@ + + + + + + @@ -7515,6 +7293,12 @@ + + + + + + @@ -7555,6 +7339,12 @@ + + + + + + @@ -7613,6 +7403,12 @@ + + + + + + @@ -8255,14 +8051,10 @@ - - - - - - - - + + + + diff --git a/gradle/versions.properties b/gradle/versions.properties index c647a9a6fcb..8a5481a0d7e 100644 --- a/gradle/versions.properties +++ b/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 diff --git a/kotlin-native/build-tools/build.gradle.kts b/kotlin-native/build-tools/build.gradle.kts index 9c77e554523..c0b8713c08f 100644 --- a/kotlin-native/build-tools/build.gradle.kts +++ b/kotlin-native/build-tools/build.gradle.kts @@ -56,7 +56,7 @@ dependencies { // Located in /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") } diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CollisionTransformer.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CollisionTransformer.kt index ccf81693bd6..011c03488c6 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CollisionTransformer.kt +++ b/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() private val foundConflictsFiles = mutableSetOf() + override fun getName() = "CollisionTransformer" + override fun canTransformResource(element: FileTreeElement): Boolean { val result = element.name in resolvedConflicts.keys if (result) { diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle index eade337d9a8..584fcf95964 100644 --- a/kotlin-native/build.gradle +++ b/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.* diff --git a/kotlin-native/gradle.properties b/kotlin-native/gradle.properties index dc3b4628571..d065e88e568 100644 --- a/kotlin-native/gradle.properties +++ b/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 diff --git a/kotlin-native/performance/buildSrc/build.gradle.kts b/kotlin-native/performance/buildSrc/build.gradle.kts index 5b86a083b24..9c7fe713fc3 100644 --- a/kotlin-native/performance/buildSrc/build.gradle.kts +++ b/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 /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") } diff --git a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts index ec2e5721636..7cecf6db46e 100644 --- a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts +++ b/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 /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") } diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle b/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle index f15b70497ed..e4781fb6646 100644 --- a/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle +++ b/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" } } diff --git a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts index 679d6e9e1dd..5752a83b843 100644 --- a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts +++ b/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 /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") } 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 162edf73c9f..4c2143deb45 100644 --- a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts +++ b/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 /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") } diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index b5ace0072b8..d80284c25d4 100644 --- a/libraries/reflect/build.gradle.kts +++ b/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() + override fun getName() = "KotlinModuleShadowTransformer" + override fun canTransformResource(element: FileTreeElement): Boolean = element.path.substringAfterLast(".") == KOTLIN_MODULE diff --git a/plugins/pill/pill-importer/build.gradle.kts b/plugins/pill/pill-importer/build.gradle.kts index 47f1d90b518..e50ccc230c3 100644 --- a/plugins/pill/pill-importer/build.gradle.kts +++ b/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 {