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

Minor, use firstFromJavaHomeThatExists for JDK for Proguard

Browse Source 
Similarly to "proguard" task in prepare/compiler/build.gradle.kts
This commit is contained in:
Alexander Udalov
2017-11-23 12:55:16 +01:00
parent 3d3ece72d2
commit 9f3577dc70
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
@@ -48,6 +48,7 @@ dependencies {
compile(project(":kotlin-stdlib")) compile(project(":kotlin-stdlib"))
proguardDeps(project(":kotlin-stdlib")) proguardDeps(project(":kotlin-stdlib"))
proguardDeps(files(firstFromJavaHomeThatExists("lib/rt.jar", "../Classes/classes.jar")))
shadows(project(":kotlin-reflect-api")) shadows(project(":kotlin-reflect-api"))
shadows(project(":core:descriptors")) shadows(project(":core:descriptors"))
@@ -158,7 +159,6 @@ val stripMetadata by tasks.creating {
val mainArchiveName = "${property("archivesBaseName")}-$version.jar" val mainArchiveName = "${property("archivesBaseName")}-$version.jar"
val outputJarPath = "$libsDir/$mainArchiveName" val outputJarPath = "$libsDir/$mainArchiveName"
val rtJar = listOf("jre/lib/rt.jar", "../Classes/classes.jar").map { File("${property("JDK_16")}/$it") }.first(File::isFile)
val proguard by task<ProGuardTask> { val proguard by task<ProGuardTask> {
dependsOn(stripMetadata) dependsOn(stripMetadata)
@@ -169,7 +169,6 @@ val proguard by task<ProGuardTask> {
outjars(outputJarPath) outjars(outputJarPath)
libraryjars(proguardDeps) libraryjars(proguardDeps)
libraryjars(rtJar)
configuration("$core/reflection.jvm/reflection.pro") configuration("$core/reflection.jvm/reflection.pro")
} }