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

Build: remove mergeServiceFiles from reflectShadowJar

Browse Source
This commit is contained in:
Sergey Rostov
2019-06-27 17:35:38 +03:00
committed by Vyacheslav Gerasimov
parent 2d6a3cb2c8
commit 6647d8fd93
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/reflect/build.gradle.kts
+1 -2
View File
@@ -109,14 +109,13 @@ class KotlinModuleShadowTransformer(private val logger: Logger) : Transformer {
val reflectShadowJar by task<ShadowJar> { val reflectShadowJar by task<ShadowJar> {
archiveClassifier.set("shadow") archiveClassifier.set("shadow")
duplicatesStrategy = DuplicatesStrategy.FAIL
configurations = listOf(embedded) configurations = listOf(embedded)
callGroovy("manifestAttributes", manifest, project, "Main" /*true*/) callGroovy("manifestAttributes", manifest, project, "Main" /*true*/)
exclude("**/*.proto") exclude("**/*.proto")
mergeServiceFiles()
if (kotlinBuildProperties.relocation) { if (kotlinBuildProperties.relocation) {
transform(KotlinModuleShadowTransformer(logger)) transform(KotlinModuleShadowTransformer(logger))
relocate("org.jetbrains.kotlin", "kotlin.reflect.jvm.internal.impl") relocate("org.jetbrains.kotlin", "kotlin.reflect.jvm.internal.impl")