From 9f3577dc702fffc289dc48410dc8ff59af3bcb47 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 23 Nov 2017 12:55:16 +0100 Subject: [PATCH] Minor, use firstFromJavaHomeThatExists for JDK for Proguard Similarly to "proguard" task in prepare/compiler/build.gradle.kts --- libraries/reflect/build.gradle.kts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index 569043fe490..91f97d5832f 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -48,6 +48,7 @@ dependencies { compile(project(":kotlin-stdlib")) proguardDeps(project(":kotlin-stdlib")) + proguardDeps(files(firstFromJavaHomeThatExists("lib/rt.jar", "../Classes/classes.jar"))) shadows(project(":kotlin-reflect-api")) shadows(project(":core:descriptors")) @@ -158,7 +159,6 @@ val stripMetadata by tasks.creating { val mainArchiveName = "${property("archivesBaseName")}-$version.jar" 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 { dependsOn(stripMetadata) @@ -169,7 +169,6 @@ val proguard by task { outjars(outputJarPath) libraryjars(proguardDeps) - libraryjars(rtJar) configuration("$core/reflection.jvm/reflection.pro") }