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

Build: restore service files relocation for kotlin-reflect

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2019-06-27 19:44:53 +03:00
parent e8ac22e238
commit 4531d2a7b4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/reflect/build.gradle.kts
+1 -1
View File
@@ -109,7 +109,6 @@ 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*/)
@@ -117,6 +116,7 @@ val reflectShadowJar by task<ShadowJar> {
exclude("**/*.proto") exclude("**/*.proto")
if (kotlinBuildProperties.relocation) { if (kotlinBuildProperties.relocation) {
mergeServiceFiles()
transform(KotlinModuleShadowTransformer(logger)) transform(KotlinModuleShadowTransformer(logger))
relocate("org.jetbrains.kotlin", "kotlin.reflect.jvm.internal.impl") relocate("org.jetbrains.kotlin", "kotlin.reflect.jvm.internal.impl")
relocate("javax.inject", "kotlin.reflect.jvm.internal.impl.javax.inject") relocate("javax.inject", "kotlin.reflect.jvm.internal.impl.javax.inject")