diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 902723e77ea..dc820f688a3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,8 +6,9 @@ gradle-enterprise = "3.12.4" gradle-plugin-publish = "1.0.0" # Version for foojay should be also synced with version in repo/gradle-settings-conventions/settings.gradle.kts gradle-toolchains-foojay-resolver = "0.4.0" +jdom2 = "2.0.6.1" kotlinx-serialization = "1.5.0" -shadow = "7.1.2" +shadow = "8.1.1" # Should be in sync with version in kotlin-native/ spdx = "0.1.0-dev-10" proguard = "6.2.2" ktor = "2.0.2" # should be in sync with versions.properties @@ -25,13 +26,14 @@ gradle-pluginPublish-gradlePlugin = { module = "com.gradle.publish:plugin-publis gradle-toolchainsFoojayResolver-gradlePlugin = { module = "org.gradle.toolchains:foojay-resolver", version.ref = "gradle-toolchains-foojay-resolver" } 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 = "gradle.plugin.com.github.johnrengelman:shadow", version.ref = "shadow" } +shadow-gradlePlugin = { module = "com.github.johnrengelman:shadow", version.ref = "shadow" } spdx-gradlePlugin = { module = "org.spdx:spdx-gradle-plugin", version.ref = "spdx" } proguard-gradlePlugin = { module = "net.sf.proguard:proguard-gradle", version.ref = "proguard" } ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } gson = { module = "com.google.code.gson:gson", version.ref = "gson" } jetbrains-ideaExt-gradlePlugin = { module = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext", version.ref = "jetbrains-ideaExt" } +jdom2 = { module = "org.jdom:jdom2", version.ref = "jdom2" } [plugins] jetbrains-ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "jetbrains-ideaExt" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index b2a8e35f536..5e097c5dabf 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -814,6 +814,12 @@ + + + + + + @@ -1790,12 +1796,6 @@ - - - - - - @@ -2612,18 +2612,18 @@ - - - - - - + + + + + + @@ -2666,18 +2666,18 @@ - - - - - - + + + + + + @@ -2834,34 +2834,22 @@ - - - - - - - - - - + + + + - - - - - - - - - - + + + + @@ -3638,10 +3626,10 @@ - - - - + + + + @@ -3824,6 +3812,12 @@ + + + + + + @@ -4980,6 +4974,12 @@ + + + + + + @@ -4998,6 +4998,12 @@ + + + + + + @@ -5010,6 +5016,12 @@ + + + + + + @@ -5190,10 +5202,10 @@ - - - - + + + + diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle index a8404033cc7..fc6b314932d 100644 --- a/kotlin-native/build.gradle +++ b/kotlin-native/build.gradle @@ -38,7 +38,7 @@ buildscript { } dependencies { - classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2' + classpath 'com.github.johnrengelman:shadow:8.1.1' } } diff --git a/kotlin-native/gradle.properties b/kotlin-native/gradle.properties index e397ee8e04b..b512df8e214 100644 --- a/kotlin-native/gradle.properties +++ b/kotlin-native/gradle.properties @@ -30,5 +30,5 @@ org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.workers.max=4 slackApiVersion=1.2.0 ktorVersion=1.2.1 -shadowVersion=7.1.2 +shadowVersion=8.1.1 metadataVersion=0.0.1-dev-10 diff --git a/kotlin-native/performance/buildSrc/build.gradle.kts b/kotlin-native/performance/buildSrc/build.gradle.kts index ce938b72b22..32f3d69cbb3 100644 --- a/kotlin-native/performance/buildSrc/build.gradle.kts +++ b/kotlin-native/performance/buildSrc/build.gradle.kts @@ -61,7 +61,7 @@ dependencies { val kotlinVersion = project.bootstrapKotlinVersion val ktorVersion = "1.2.1" val slackApiVersion = "1.2.0" - val shadowVersion = "7.1.2" + val shadowVersion = "8.1.1" val metadataVersion = "0.0.1-dev-10" implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") @@ -77,7 +77,7 @@ dependencies { // Located in /shared and always provided by the composite build. //api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion") - implementation("gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion") + implementation("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 62928b2d8dd..e8873e34f84 100644 --- a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts @@ -64,7 +64,7 @@ dependencies { val kotlinVersion = project.bootstrapKotlinVersion val ktorVersion = "1.2.1" val slackApiVersion = "1.2.0" - val shadowVersion = "7.1.2" + val shadowVersion = "8.1.1" val metadataVersion = "0.0.1-dev-10" implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") @@ -82,7 +82,7 @@ dependencies { // Located in /shared and always provided by the composite build. //api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion") - implementation("gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion") + implementation("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 2efd0161192..a78e2f480cd 100644 --- a/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle +++ b/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle @@ -31,7 +31,7 @@ buildscript { } dependencies { - classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2' + classpath 'com.github.johnrengelman:shadow:8.1.1' classpath "org.jetbrains.kotlin:kotlin-native-shared:$kotlinVersion" } } diff --git a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts index 5d1eda47f7a..02ab8fe4d1a 100644 --- a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts @@ -66,7 +66,7 @@ dependencies { val kotlinVersion = project.bootstrapKotlinVersion val ktorVersion = "1.2.1" val slackApiVersion = "1.2.0" - val shadowVersion = "7.1.2" + val shadowVersion = "8.1.1" val metadataVersion = "0.0.1-dev-10" implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") @@ -82,6 +82,6 @@ dependencies { // Located in /shared and always provided by the composite build. //api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion") - implementation("gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion") + implementation("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 44f76a73831..64e95776fe9 100644 --- a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts @@ -65,7 +65,7 @@ dependencies { val kotlinVersion = project.bootstrapKotlinVersion val ktorVersion = "1.2.1" val slackApiVersion = "1.2.0" - val shadowVersion = "7.1.2" + val shadowVersion = "8.1.1" val metadataVersion = "0.0.1-dev-10" implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") @@ -81,6 +81,6 @@ dependencies { // Located in /shared and always provided by the composite build. //api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion") - implementation("gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion") + implementation("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 90ffb9f5024..24b66a90ea6 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -3,9 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.CacheableTransfor import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext import kotlinx.metadata.jvm.KotlinModuleMetadata +import org.apache.tools.zip.ZipEntry +import org.apache.tools.zip.ZipOutputStream import org.gradle.kotlin.dsl.support.serviceOf -import shadow.org.apache.tools.zip.ZipEntry -import shadow.org.apache.tools.zip.ZipOutputStream description = "Kotlin Full Reflection Library" @@ -229,7 +229,7 @@ val intermediate = when { kotlinBuildProperties.relocation -> stripMetadata else -> reflectShadowJar } - + val result by task { dependsOn(intermediate) from { diff --git a/plugins/pill/pill-importer/build.gradle.kts b/plugins/pill/pill-importer/build.gradle.kts index a09a584f099..539c3b3c26c 100644 --- a/plugins/pill/pill-importer/build.gradle.kts +++ b/plugins/pill/pill-importer/build.gradle.kts @@ -17,6 +17,7 @@ dependencies { compileOnly(gradleApi()) compileOnly(gradleKotlinDsl()) compileOnly(libs.shadow.gradlePlugin) + compileOnly(libs.jdom2) } sourceSets { diff --git a/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt b/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt index 01f800c237a..ecede701bde 100644 --- a/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt +++ b/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt @@ -11,16 +11,17 @@ import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.tasks.SourceSet import org.gradle.kotlin.dsl.extra import org.gradle.kotlin.dsl.getByType +import org.jdom2.Element +import org.jdom2.Verifier +import org.jdom2.input.SAXBuilder +import org.jdom2.output.Format +import org.jdom2.output.XMLOutputter import org.jetbrains.kotlin.pill.artifact.ArtifactDependencyMapper import org.jetbrains.kotlin.pill.artifact.ArtifactGenerator import org.jetbrains.kotlin.pill.model.PDependency import org.jetbrains.kotlin.pill.model.PLibrary import org.jetbrains.kotlin.pill.model.POrderRoot import org.jetbrains.kotlin.pill.model.PProject -import shadow.org.jdom2.input.SAXBuilder -import shadow.org.jdom2.* -import shadow.org.jdom2.output.Format -import shadow.org.jdom2.output.XMLOutputter import java.io.File import java.util.* import kotlin.collections.HashMap @@ -290,7 +291,6 @@ class JpsCompatiblePluginTasks( kotlinJunitConfiguration.applyJUnitTemplate() val output = XMLOutputter().also { - @Suppress("UsePropertyAccessSyntax") it.format = Format.getPrettyFormat().apply { setEscapeStrategy { c -> Verifier.isHighSurrogate(c) || c == '"' } setIndent(" ") diff --git a/plugins/pill/pill-importer/src/util/XmlNode.kt b/plugins/pill/pill-importer/src/util/XmlNode.kt index aa3e9fc83e6..b3cd281483e 100644 --- a/plugins/pill/pill-importer/src/util/XmlNode.kt +++ b/plugins/pill/pill-importer/src/util/XmlNode.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.pill.util -import shadow.org.jdom2.Document -import shadow.org.jdom2.Element -import shadow.org.jdom2.output.Format -import shadow.org.jdom2.output.XMLOutputter +import org.jdom2.Document +import org.jdom2.Element +import org.jdom2.output.Format +import org.jdom2.output.XMLOutputter fun xml(name: String, vararg args: Pair, block: XmlNode.() -> Unit = {}): XmlNode { return XmlNode(name, args.asList(), block) @@ -19,7 +19,6 @@ class XmlNode(val name: String, private val args: List>, block private var value: Any? = null init { - @Suppress("UNUSED_EXPRESSION") block() } diff --git a/prepare/compiler-embeddable/build.gradle.kts b/prepare/compiler-embeddable/build.gradle.kts index 9c667a3049d..3b16a60677a 100644 --- a/prepare/compiler-embeddable/build.gradle.kts +++ b/prepare/compiler-embeddable/build.gradle.kts @@ -1,9 +1,4 @@ -import java.util.stream.Collectors -import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer -import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext import org.gradle.kotlin.dsl.support.serviceOf -import shadow.org.apache.tools.zip.ZipEntry -import shadow.org.apache.tools.zip.ZipOutputStream description = "Kotlin Compiler (embeddable)" diff --git a/repo/gradle-build-conventions/buildsrc-compat/build.gradle.kts b/repo/gradle-build-conventions/buildsrc-compat/build.gradle.kts index 9f5eb47687b..d49947f9c93 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/build.gradle.kts +++ b/repo/gradle-build-conventions/buildsrc-compat/build.gradle.kts @@ -74,10 +74,9 @@ dependencies { implementation(libs.spdx.gradlePlugin) implementation(libs.dexMemberList) - implementation(libs.shadow.gradlePlugin) { - // https://github.com/johnrengelman/shadow/issues/807 - exclude("org.ow2.asm") - } + // Keep in mind https://github.com/johnrengelman/shadow/issues/807 issue as shadow plugin brings transitively "org.ow2.asm" dependency, + // which could conflict with a version in Kotlin compiler brought by KGP. + implementation(libs.shadow.gradlePlugin) implementation(libs.proguard.gradlePlugin) implementation(libs.jetbrains.ideaExt.gradlePlugin)