diff --git a/d2j-base-cmd/build.gradle b/d2j-base-cmd/build.gradle index aaa9d1311..895452e2f 100644 --- a/d2j-base-cmd/build.gradle +++ b/d2j-base-cmd/build.gradle @@ -1,5 +1,5 @@ description = 'a simple cmd parser' dependencies { - implementation group: 'org.ow2.asm', name: 'asm', version: '9.3' + implementation fileTree(dir: '../libs', include: '*.jar') } diff --git a/d2j-jasmin/build.gradle b/d2j-jasmin/build.gradle index cf8878878..3a92f0cd0 100644 --- a/d2j-jasmin/build.gradle +++ b/d2j-jasmin/build.gradle @@ -4,9 +4,20 @@ dependencies { implementation(group: 'org.antlr', name: 'antlr-runtime', version: '3.5.3') { exclude(module: 'stringtemplate') } - implementation group: 'org.ow2.asm', name: 'asm', version: '9.3' - implementation group: 'org.ow2.asm', name: 'asm-tree', version: '9.3' - implementation group: 'org.ow2.asm', name: 'asm-util', version: '9.3' + implementation fileTree(dir: '../libs', include: '*.jar') + // implementation group: 'org.ow2.asm', name: 'asm', version: '9.3' // Fixed MethodCodeTooLargeException + implementation(group: 'org.ow2.asm', name: 'asm-analysis', version: '9.3') { + exclude(module: 'asm') + } + implementation(group: 'org.ow2.asm', name: 'asm-commons', version: '9.3') { + exclude(module: 'asm') + } + implementation(group: 'org.ow2.asm', name: 'asm-tree', version: '9.3') { + exclude(module: 'asm') + } + implementation(group: 'org.ow2.asm', name: 'asm-util', version: '9.3') { + exclude(module: 'asm') + } implementation project(':d2j-base-cmd') antlr 'org.antlr:antlr:3.5.3' } diff --git a/d2j-smali/build.gradle b/d2j-smali/build.gradle index fd30a5dfd..f26ff6e05 100644 --- a/d2j-smali/build.gradle +++ b/d2j-smali/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'antlr' dependencies { - implementation 'org.antlr:antlr4-runtime:4.9.3' + implementation 'org.antlr:antlr4-runtime:4.9.3' // Newer versions only for Java 11+ implementation project(':dex-reader') implementation project(':dex-reader-api') antlr 'org.antlr:antlr4:4.9.3' diff --git a/dex-tools/build.gradle b/dex-tools/build.gradle index 80cf362f1..c1d17eb99 100644 --- a/dex-tools/build.gradle +++ b/dex-tools/build.gradle @@ -14,10 +14,19 @@ dependencies { implementation project(':dex-reader') implementation project(':d2j-base-cmd') implementation fileTree(dir: '../libs', include: '*.jar') - implementation group: 'org.ow2.asm', name: 'asm', version: '9.3' - implementation group: 'org.ow2.asm', name: 'asm-tree', version: '9.3' - implementation group: 'org.ow2.asm', name: 'asm-util', version: '9.3' - implementation group: 'org.ow2.asm', name: 'asm-commons', version: '9.3' + // implementation group: 'org.ow2.asm', name: 'asm', version: '9.3' // Fixed MethodCodeTooLargeException + implementation(group: 'org.ow2.asm', name: 'asm-analysis', version: '9.3') { + exclude(module: 'asm') + } + implementation(group: 'org.ow2.asm', name: 'asm-commons', version: '9.3') { + exclude(module: 'asm') + } + implementation(group: 'org.ow2.asm', name: 'asm-tree', version: '9.3') { + exclude(module: 'asm') + } + implementation(group: 'org.ow2.asm', name: 'asm-util', version: '9.3') { + exclude(module: 'asm') + } } task bin_gen(type: JavaExec) { diff --git a/dex-translator/build.gradle b/dex-translator/build.gradle index f049f5c5c..54190084f 100644 --- a/dex-translator/build.gradle +++ b/dex-translator/build.gradle @@ -9,11 +9,20 @@ dependencies { api project(':dex-reader') api project(':dex-ir') api project(':d2j-base-cmd') - api group: 'org.ow2.asm', name: 'asm', version: '9.3' - api group: 'org.ow2.asm', name: 'asm-tree', version: '9.3' - api group: 'org.ow2.asm', name: 'asm-util', version: '9.3' - api group: 'org.ow2.asm', name: 'asm-commons', version: '9.3' api fileTree(dir: '../libs', include: '*.jar') + // api group: 'org.ow2.asm', name: 'asm', version: '9.3' // Fixed MethodCodeTooLargeException + api(group: 'org.ow2.asm', name: 'asm-analysis', version: '9.3') { + exclude(module: 'asm') + } + api(group: 'org.ow2.asm', name: 'asm-commons', version: '9.3') { + exclude(module: 'asm') + } + api(group: 'org.ow2.asm', name: 'asm-tree', version: '9.3') { + exclude(module: 'asm') + } + api(group: 'org.ow2.asm', name: 'asm-util', version: '9.3') { + exclude(module: 'asm') + } testImplementation project(':d2j-smali') testImplementation project(':d2j-jasmin') } diff --git a/libs/asm-9.3-mctle.jar b/libs/asm-9.3-mctle.jar new file mode 100644 index 000000000..96a1d07ec Binary files /dev/null and b/libs/asm-9.3-mctle.jar differ