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

JesusFreke · Mar 2, 2021 · 1d72698 · 1d72698
1 parent 93e7043
commit 1d72698
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/baksmali/build.gradle b/baksmali/build.gradle
@@ -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

diff --git a/build.gradle b/build.gradle
@@ -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

diff --git a/smali/build.gradle b/smali/build.gradle
@@ -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