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

Mix kotlin-annotations-jvm with kotlin-reflect into proguard

Browse Source 
So it can strip these annotations from the resulting jar.

#KT-26929 Fixed
This commit is contained in:
Ilya Gorbunov
2018-09-18 20:37:22 +03:00
committed by Alexander Udalov
parent 64d2cdf0c2
commit 86ba5ebf29
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/reflect/build.gradle.kts
+3 -1
View File
@@ -39,6 +39,7 @@ val libsDir = property("libsDir")
val proguardDeps by configurations.creating val proguardDeps by configurations.creating
val proguardAdditionalInJars by configurations.creating
val shadows by configurations.creating { val shadows by configurations.creating {
isTransitive = false isTransitive = false
} }
@@ -49,7 +50,7 @@ dependencies {
compile(project(":kotlin-stdlib")) compile(project(":kotlin-stdlib"))
proguardDeps(project(":kotlin-stdlib")) proguardDeps(project(":kotlin-stdlib"))
proguardDeps(project(":kotlin-annotations-jvm")) proguardAdditionalInJars(project(":kotlin-annotations-jvm"))
proguardDeps(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar", jdkHome = File(property("JDK_16") as String)))) proguardDeps(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar", jdkHome = File(property("JDK_16") as String))))
shadows(project(":kotlin-reflect-api")) shadows(project(":kotlin-reflect-api"))
@@ -146,6 +147,7 @@ val proguard by task<ProGuardTask> {
outputs.file(proguardOutput) outputs.file(proguardOutput)
injars(mapOf("filter" to "!META-INF/versions/**"), stripMetadata.outputs.files) injars(mapOf("filter" to "!META-INF/versions/**"), stripMetadata.outputs.files)
injars(mapOf("filter" to "!META-INF/**"), proguardAdditionalInJars)
outjars(proguardOutput) outjars(proguardOutput)
libraryjars(mapOf("filter" to "!META-INF/versions/**"), proguardDeps) libraryjars(mapOf("filter" to "!META-INF/versions/**"), proguardDeps)