From a7396d8c10980e39fa261375b0ddd29ca96fb2cb Mon Sep 17 00:00:00 2001 From: Bogdan Mukvich Date: Tue, 25 Apr 2023 15:32:43 +0200 Subject: [PATCH] Make gradle integration proguard test JDK 11 compatible --- .../testProject/interopWithProguarded/lib/build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/interopWithProguarded/lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/interopWithProguarded/lib/build.gradle index d4a62dce17f..9f10261fc89 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/interopWithProguarded/lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/interopWithProguarded/lib/build.gradle @@ -24,7 +24,13 @@ configurations { task obfuscate(type: proguard.gradle.ProGuardTask, dependsOn: jar) { injars "${jar.archivePath}" outjars "$buildDir/proguard/out.jar" - libraryjars "$System.env.JAVA_HOME/jre/lib/rt.jar" + + if (JavaVersion.current().isJava9Compatible()) { + libraryjars "${System.getProperty('java.home')}/jmods" + } else { + libraryjars "${System.getProperty('java.home')}/lib/rt.jar" + } + libraryjars configurations.named("resolvableImplementation") dontobfuscate