ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-12-04 18:12:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2199 from IgorEisberg/master

Browse Source 
build: update to smali/baksmali 2.3.4
This commit is contained in:
Connor Tumbleson 2019-10-20 14:38:26 -04:00 committed by GitHub
commit 6d2878cca1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
brut.apktool/apktool-cli/build.gradle
View File

@ -45,9 +45,11 @@ task proguard(type: proguard.gradle.ProGuardTask, dependsOn: shadowJar) {
// Java 9 and prior uses merged package for runtime, later uses split jmod files.
if (JavaVersion.current() <= JavaVersion.VERSION_1_8) {
libraryjars "${System.properties['java.home']}/lib/jce.jar"
libraryjars "${System.properties['java.home']}/lib/rt.jar"
} else {
libraryjars "${System.properties['java.home']}/jmods/java.base.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
libraryjars "${System.properties['java.home']}/jmods/java.compiler.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
libraryjars "${System.properties['java.home']}/jmods/java.logging.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
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'

2
brut.apktool/apktool-lib/src/main/java/brut/androlib/mod/SmaliMod.java
View File

@ -59,7 +59,7 @@ public class SmaliMod {
InputStream is = new FileInputStream(smaliFile);
InputStreamReader reader = new InputStreamReader(is, "UTF-8");
lexer = new smaliFlexLexer(reader);
lexer = new smaliFlexLexer(reader, apiLevel);
((smaliFlexLexer)lexer).setSourceFile(smaliFile);
tokens = new CommonTokenStream((TokenSource) lexer);

4
build.gradle
View File

@ -109,7 +109,7 @@ subprojects {
ext {
depends = [
baksmali: 'org.smali:baksmali:2.3',
baksmali: 'org.smali:baksmali:2.3.4',
commons_cli: 'commons-cli:commons-cli:1.4',
commons_io: 'commons-io:commons-io:2.4',
commons_lang: 'org.apache.commons:commons-lang3:3.1',
@ -117,7 +117,7 @@ subprojects {
junit: 'junit:junit:4.12',
proguard_gradle: 'net.sf.proguard:proguard-gradle:6.1.1',
snakeyaml: 'org.yaml:snakeyaml:1.18:android',
smali: 'org.smali:smali:2.3',
smali: 'org.smali:smali:2.3.4',
xmlpull: 'xpp3:xpp3:1.1.4c',
xmlunit: 'xmlunit:xmlunit:1.6',
]