From 24c3c0dbc9e20288393e55e5e3f8908766a6a890 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sat, 13 Jul 2019 08:37:59 -0400 Subject: [PATCH] fix: properly determine greater than java8 --- brut.apktool/apktool-cli/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/brut.apktool/apktool-cli/build.gradle b/brut.apktool/apktool-cli/build.gradle index 80779c29..7f145c4a 100644 --- a/brut.apktool/apktool-cli/build.gradle +++ b/brut.apktool/apktool-cli/build.gradle @@ -44,10 +44,10 @@ task proguard(type: proguard.gradle.ProGuardTask, dependsOn: shadowJar) { injars shadowJar.getArchiveFile() // Java 9 and prior uses merged package for runtime, later uses split jmod files. - if (System.getProperty("java.version").startsWith('1.')) { + if (JavaVersion.current() <= JavaVersion.VERSION_1_8) { libraryjars "${System.properties['java.home']}/lib/rt.jar" } else { - libraryjars "${System.getProperty('java.home')}/jmods/java.base.jmod", jarfilter: '!**.jar', filter: '!module-info.class' + libraryjars "${System.properties['java.home']}/jmods/java.base.jmod", jarfilter: '!**.jar', filter: '!module-info.class' } dontobfuscate