Replace use of deprecated methods with their recommended replacements (…

…#2713) * Replace use of deprecated methods with their recommended replacements * Add scripting jmod to proguard inputs
iBotPeaches · Dec 13, 2021 · 95874be · 95874be
1 parent 6cfe298
commit 95874be
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/brut.apktool/apktool-cli/build.gradle b/brut.apktool/apktool-cli/build.gradle
@@ -58,6 +58,7 @@ task proguard(type: ProGuardTask, dependsOn: shadowJar) {
         libraryjars "${System.properties['java.home']}/jmods/java.xml.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
         libraryjars "${System.properties['java.home']}/jmods/java.desktop.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
         libraryjars "${System.properties['java.home']}/jmods/java.sql.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
+        libraryjars "${System.properties['java.home']}/jmods/java.scripting.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
 
         libraryjars "${System.properties['java.home']}/jmods/jdk.unsupported.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
     }

diff --git a/brut.apktool/apktool-lib/build.gradle b/brut.apktool/apktool-lib/build.gradle
@@ -45,7 +45,8 @@ dependencies {
                    depends.xmlpull,
                    depends.guava,
                    depends.commons_lang,
-                   depends.commons_io
+                   depends.commons_io,
+                   depends.commons_text
 
     testImplementation depends.xmlunit
 }
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/YamlStringEscapeUtils.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/YamlStringEscapeUtils.java
@@ -16,8 +16,8 @@
  */
 package brut.androlib.meta;
 
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.text.translate.CharSequenceTranslator;
+import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.text.translate.CharSequenceTranslator;
 
 import java.io.IOException;
 import java.io.StringWriter;

diff --git a/build.gradle b/build.gradle
@@ -22,6 +22,7 @@ buildscript {
                 commons_cli    : 'commons-cli:commons-cli:1.4',
                 commons_io     : 'commons-io:commons-io:2.11.0',
                 commons_lang   : 'org.apache.commons:commons-lang3:3.12.0',
+                commons_text   : 'org.apache.commons:commons-text:1.9',
                 guava          : 'com.google.guava:guava:30.1.1-jre',
                 junit          : 'junit:junit:4.13.2',
                 proguard_gradle: 'com.guardsquare:proguard-gradle:7.1.1',