Update proguard version to 6.2.2, to support building with java 11

This commit is contained in:
Ben Gruver 2021-03-01 16:21:33 -08:00
parent 93e7043ac7
commit 1d72698081
3 changed files with 13 additions and 5 deletions

View File

@ -90,10 +90,14 @@ task proguard(type: proguard.gradle.ProGuardTask, dependsOn: fatJar) {
def outFile = fatJar.destinationDirectory.file(
"${fatJar.archiveBaseName.get()}-${fatJar.archiveVersion.get()}-small.${fatJar.archiveExtension.get()}")
injars fatJar.archivePath
injars fatJar
outjars outFile
libraryjars "${System.properties['java.home']}/lib/rt.jar"
if (JavaVersion.current().isJava9Compatible()) {
libraryjars(System.getProperty("java.home") + "/jmods")
} else {
libraryjars(System.getProperty("java.home") + "/lib/rt.jar")
}
dontobfuscate
dontoptimize

View File

@ -100,7 +100,7 @@ subprojects {
antlr: 'org.antlr:antlr:3.5.2',
stringtemplate: 'org.antlr:stringtemplate:3.2.1',
jflex_plugin: 'org.xbib.gradle.plugin:gradle-plugin-jflex:1.1.0',
proguard_gradle: 'net.sf.proguard:proguard-gradle:5.2.1',
proguard_gradle: 'net.sf.proguard:proguard-gradle:6.2.2',
dx: 'com.google.android.tools:dx:1.7',
gson: 'com.google.code.gson:gson:2.3.1',
jcommander: jcommanderVersion

View File

@ -138,10 +138,14 @@ task proguard(type: proguard.gradle.ProGuardTask, dependsOn: fatJar) {
def outFile = fatJar.destinationDirectory.file(
"${fatJar.archiveBaseName.get()}-${fatJar.archiveVersion.get()}-small.${fatJar.archiveExtension.get()}")
injars fatJar.archivePath
injars fatJar
outjars outFile
libraryjars "${System.properties['java.home']}/lib/rt.jar"
if (JavaVersion.current().isJava9Compatible()) {
libraryjars(System.getProperty("java.home") + "/jmods")
} else {
libraryjars(System.getProperty("java.home") + "/lib/rt.jar")
}
dontobfuscate
dontoptimize