From 232e801e4d94bdf8d9f3333f9fa0047989834e53 Mon Sep 17 00:00:00 2001
From: IgorEisberg <iagucool@gmail.com>
Date: Fri, 18 Oct 2019 04:03:53 +0300
Subject: [PATCH] build: update to smali/baksmali 2.3.4

---
 brut.apktool/apktool-cli/build.gradle                         | 1 +
 .../apktool-lib/src/main/java/brut/androlib/mod/SmaliMod.java | 2 +-
 build.gradle                                                  | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/brut.apktool/apktool-cli/build.gradle b/brut.apktool/apktool-cli/build.gradle
index d4f0dec4..9f5de4d5 100644
--- a/brut.apktool/apktool-cli/build.gradle
+++ b/brut.apktool/apktool-cli/build.gradle
@@ -45,6 +45,7 @@ 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'
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/mod/SmaliMod.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/mod/SmaliMod.java
index a622af43..8753f6fd 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/mod/SmaliMod.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/mod/SmaliMod.java
@@ -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);
 
diff --git a/build.gradle b/build.gradle
index 90f12505..3ebd2692 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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',
         ]