azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[repo] Update the shadow version to 8.1.1 release

Browse Source 
https://github.com/johnrengelman/shadow/releases/tag/8.1.1
This commit is contained in:
Yahor Berdnikau
2023-08-04 12:31:08 +02:00
committed by Space Team
parent c701677e45
commit 380062c511
15 changed files with 89 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle/libs.versions.toml
+4 -2
View File
@@ -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" }
gradle/verification-metadata.xml
+58 -46
View File
@@ -814,6 +814,12 @@
<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"/>
@@ -1790,12 +1796,6 @@
<sha256 value="0f672662227ec8c2c159e18c052418f67de0ebf15c0337010ce85ea77ddc02f9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="gradle.plugin.com.github.johnrengelman" name="shadow" version="7.1.2">
<artifact name="shadow-7.1.2.jar">
<md5 value="0e152cbfd964889d83033c1071488e31" origin="Generated by Gradle"/>
<sha256 value="bf705cc2ea5c0180aa870a0fa80b39bf13a14d27128e1eb3a4b674be34f58e90" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="gradle.plugin.org.gradle.crypto" name="checksum" version="1.4.0">
<artifact name="checksum-1.4.0.jar">
<md5 value="d088dfb5dc71c2c0ecb0df050c1f11c9" origin="Generated by Gradle"/>
@@ -2612,18 +2612,18 @@
<sha256 value="2ee26418e492a618dcdeeca33218aaf8c88e4129999d75be3a25d2153a7eb5d2" 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.12">
<artifact name="ant-1.10.12.jar">
<md5 value="f5b97fb267862b35d1eb398defe1831a" origin="Generated by Gradle"/>
<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"/>
</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"/>
@@ -2666,18 +2666,18 @@
<sha256 value="800eb1f75188fd1e2cd9e7ba31561f16e3bd81b94e813821440f03a0fa07ce50" origin="Generated by Gradle"/>
</artifact>
</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.12">
<artifact name="ant-launcher-1.10.12.jar">
<md5 value="709ed15ea16a95903e7b3e8be130fa1e" origin="Generated by Gradle"/>
<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"/>
</artifact>
</component>
<component group="org.apache.ant" name="ant-launcher" version="1.10.7">
<artifact name="ant-launcher-1.10.7.jar">
<md5 value="68e4ba132f8168520087c3d89ca87b2a" origin="Generated by Gradle"/>
@@ -2834,34 +2834,22 @@
<sha256 value="0b2b1102c18d3c7e05a77214b9b7501a6f6056174ae5604e0e256776eda7553e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.logging.log4j" name="log4j-api" version="2.17.1">
<artifact name="log4j-api-2.17.1.jar">
<md5 value="dfd5f2d81aba31583ee87fe16c7b78f8" origin="Generated by Gradle"/>
<sha256 value="b0d8a4c8ab4fb8b1888d0095822703b0e6d4793c419550203da9e69196161de4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.logging.log4j" name="log4j-api" version="2.17.2">
<artifact name="log4j-api-2.17.2.jar">
<md5 value="0c39d90e7819c92c111e447bdf786a90" origin="Generated by Gradle"/>
<sha256 value="09351b5a03828f369cdcff76f4ed39e6a6fc20f24f046935d0b28ef5152f8ce4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.logging.log4j" name="log4j-api" version="2.18.0">
<artifact name="log4j-api-2.18.0.jar">
<md5 value="38d29af13312d716f8d1d8fd79736f05" origin="Generated by Gradle"/>
<sha256 value="b977057233153b242ac58cc5b7d3121136b9c34c86c1e191c042ba4a828144c5" origin="Generated by Gradle"/>
<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"/>
</artifact>
</component>
<component group="org.apache.logging.log4j" name="log4j-core" version="2.17.1">
<artifact name="log4j-core-2.17.1.jar">
<md5 value="8d2f5c52700336dae846b2c3ecde7a6e" origin="Generated by Gradle"/>
<sha256 value="c967f223487980b9364e94a7c7f9a8a01fd3ee7c19bdbf0b0f9f8cb8511f3d41" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.logging.log4j" name="log4j-core" version="2.18.0">
<artifact name="log4j-core-2.18.0.jar">
<md5 value="8869945da3b66916542b9fdd2e2605f2" origin="Generated by Gradle"/>
<sha256 value="ec7a23bfaf4d8ddf3394671561dd4a0f35b69d6fa6918734e3e8bc4066f741c4" origin="Generated by Gradle"/>
<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"/>
</artifact>
</component>
<component group="org.apache.logging.log4j" name="log4j-slf4j18-impl" version="2.18.0">
@@ -3638,10 +3626,10 @@
<sha256 value="52d85e04b3918722af11d12855b4a8257df96a0e76c8f4e3852e6faa851f357b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.codehaus.plexus" name="plexus-utils" version="3.4.2">
<artifact name="plexus-utils-3.4.2.jar">
<md5 value="c1c94fdc23c54654c59909136b85cf5f" origin="Generated by Gradle"/>
<sha256 value="f957f13604ea1686de805801862f339dbbb6eab9a66f9cc7e4a5c5b27e4fcecc" origin="Generated by Gradle"/>
<component group="org.codehaus.plexus" name="plexus-utils" version="3.5.1">
<artifact name="plexus-utils-3.5.1.jar">
<md5 value="cdec471a77f52e687d0df4c43f392a71" origin="Generated by Gradle"/>
<sha256 value="86e0255d4c879c61b4833ed7f13124e8bb679df47debb127326e7db7dd49a07b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.codehaus.woodstox" name="stax2-api" version="4.2">
@@ -3824,6 +3812,12 @@
<sha256 value="1345f11ba606d15603d6740551a8c21947c0215640770ec67271fe78bea97cf5" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jdom" name="jdom2" version="2.0.6.1">
<artifact name="jdom2-2.0.6.1.jar">
<md5 value="5be72710c66f3c9ba71f8009e92597d1" origin="Generated by Gradle"/>
<sha256 value="0b20f45e3a0fd8f0d12cdc5316b06776e902b1365db00118876f9175c60f302c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains" name="annotations" version="13.0">
<artifact name="annotations-13.0.jar">
<md5 value="f4fb462172517b46b6cd90003508515a" origin="Generated by Gradle"/>
@@ -4980,6 +4974,12 @@
<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-analysis" version="9.2">
<artifact name="asm-analysis-9.2.jar">
<md5 value="e62aa59de96ae29c690c3521ea4b6359" origin="Generated by Gradle"/>
@@ -4998,6 +4998,12 @@
<sha256 value="be4ce53138a238bb522cd781cf91f3ba5ce2f6ca93ec62d46a162a127225e0a6" 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-tree" version="6.0">
<artifact name="asm-tree-6.0.jar">
<md5 value="076f7668703c07ff671837ad17f59ea1" origin="Generated by Gradle"/>
@@ -5010,6 +5016,12 @@
<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-util" version="9.2">
<artifact name="asm-util-9.2.jar">
<md5 value="8562ac2619220b948cef931285b1e13b" origin="Generated by Gradle"/>
@@ -5190,10 +5202,10 @@
<sha256 value="e549db50dcc421f9501d6af933af15e4fba96617577409d939724cd7e1a25033" origin="Generated by Gradle"/>
</artifact>
</component>
<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"/>
<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"/>
</artifact>
</component>
<component group="org.webjars" name="jquery" version="3.5.1">
kotlin-native/build.gradle
+1 -1
View File
@@ -38,7 +38,7 @@ buildscript {
}
dependencies {
classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
classpath 'com.github.johnrengelman:shadow:8.1.1'
}
}
kotlin-native/gradle.properties
+1 -1
View File
@@ -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
kotlin-native/performance/buildSrc/build.gradle.kts
+2 -2
View File
@@ -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 <repo root>/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")
}
kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts
+2 -2
View File
@@ -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 <repo root>/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")
}
kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle
+1 -1
View File
@@ -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"
}
}
kotlin-native/tools/performance-server/buildSrc/build.gradle.kts
+2 -2
View File
@@ -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 <repo root>/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")
}
kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts
+2 -2
View File
@@ -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 <repo root>/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")
}
libraries/reflect/build.gradle.kts
+3 -3
View File
@@ -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<Jar> {
dependsOn(intermediate)
from {
plugins/pill/pill-importer/build.gradle.kts
+1
View File
@@ -17,6 +17,7 @@ dependencies {
compileOnly(gradleApi())
compileOnly(gradleKotlinDsl())
compileOnly(libs.shadow.gradlePlugin)
compileOnly(libs.jdom2)
}
sourceSets {
plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt
+5 -5
View File
@@ -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(" ")
plugins/pill/pill-importer/src/util/XmlNode.kt
+4 -5
View File
@@ -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<String, Any>, block: XmlNode.() -> Unit = {}): XmlNode {
return XmlNode(name, args.asList(), block)
@@ -19,7 +19,6 @@ class XmlNode(val name: String, private val args: List<Pair<String, Any>>, block
private var value: Any? = null
init {
@Suppress("UNUSED_EXPRESSION")
block()
}
prepare/compiler-embeddable/build.gradle.kts
-5
View File
@@ -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)"
repo/gradle-build-conventions/buildsrc-compat/build.gradle.kts
+3 -4
View File
@@ -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)