diff --git a/build.gradle b/build.gradle index db6f1a32251d6601ffd6e3ae074169b04b3f8181..991af3a572ecbd404516541a396287625fa35fbf 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'org.sonarqube' version '2.8' id 'com.github.ben-manes.versions' version '0.27.0' - id "com.diffplug.gradle.spotless" version "3.26.0" + id "com.diffplug.gradle.spotless" version "3.27.1" } ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev" @@ -33,15 +33,15 @@ allprojects { } dependencies { - compile 'org.slf4j:slf4j-api:1.7.29' + compile 'org.slf4j:slf4j-api:1.7.30' testCompile 'ch.qos.logback:logback-classic:1.2.3' testCompile 'org.hamcrest:hamcrest-library:2.2' - testCompile 'org.mockito:mockito-core:3.1.0' - testCompile 'org.assertj:assertj-core:3.14.0' + testCompile 'org.mockito:mockito-core:3.2.4' + testCompile 'org.assertj:assertj-core:3.15.0' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.2' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.0' testCompile 'org.eclipse.jdt.core.compiler:ecj:4.6.1' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index cc4fdc293d0e50b0ad9b65c16e7ddd1db2f6025b..f3d88b1c2faf2fc91d853cd5d4242b5547257070 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94920145f34efc0ba3c89fe0de9c9c0997b36023..1b16c34a71cf212ed0cfb883d14d1b8511903eb2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jadx-core/build.gradle b/jadx-core/build.gradle index 83fdb0b29c6e7f44cd35a21ef0319c90d5c4f615..e12f8a98b09e7db994e162d6ab85e684c515fa83 100644 --- a/jadx-core/build.gradle +++ b/jadx-core/build.gradle @@ -4,15 +4,15 @@ dependencies { compile files('lib/dx-1.16.jar') // TODO: dx don't support java version > 9 (53) - compile 'org.ow2.asm:asm:7.2' + compile 'org.ow2.asm:asm:7.3.1' compile 'org.jetbrains:annotations:18.0.0' compile 'com.google.code.gson:gson:2.8.6' - compile 'org.smali:baksmali:2.3.4' - compile('org.smali:smali:2.3.4') { + compile 'org.smali:baksmali:2.4.0' + compile('org.smali:smali:2.4.0') { exclude group: 'com.google.guava' } - compile 'com.google.guava:guava:28.1-jre' + compile 'com.google.guava:guava:28.2-jre' testCompile 'org.apache.commons:commons-lang3:3.9' } diff --git a/jadx-core/src/main/java/jadx/core/utils/SmaliUtils.java b/jadx-core/src/main/java/jadx/core/utils/SmaliUtils.java index aea2a162f6f7603d57026096d19c8a61cb6b1db3..6ac93d7e4a47808c8622633dea2be95c0b148f7b 100644 --- a/jadx-core/src/main/java/jadx/core/utils/SmaliUtils.java +++ b/jadx-core/src/main/java/jadx/core/utils/SmaliUtils.java @@ -37,7 +37,7 @@ public class SmaliUtils { try { Path path = dex.getDexFile().getPath(); DexBackedDexFile dexFile = DexFileFactory.loadDexFile(path.toFile(), null); - DexBackedClassDef dexBackedClassDef = new DexBackedClassDef(dexFile, clsDefOffset); + DexBackedClassDef dexBackedClassDef = new DexBackedClassDef(dexFile, clsDefOffset, 0); getSmaliCode(dexBackedClassDef, stringWriter); return true; } catch (Exception e) { diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle index e95dafe949ba04565f6e745493dfc9ca6f029b61..27cf4fa17368a35e9de04cdbb87ff72d505b4110 100644 --- a/jadx-gui/build.gradle +++ b/jadx-gui/build.gradle @@ -8,16 +8,16 @@ dependencies { compile(project(":jadx-core")) compile(project(":jadx-cli")) - compile 'com.fifesoft:rsyntaxtextarea:3.0.4' + compile 'com.fifesoft:rsyntaxtextarea:3.0.8' compile files('libs/jfontchooser-1.0.5.jar') compile 'hu.kazocsaba:image-viewer:1.2.3' compile 'org.apache.commons:commons-lang3:3.9' compile 'org.apache.commons:commons-text:1.8' - compile 'io.reactivex.rxjava2:rxjava:2.2.15' + compile 'io.reactivex.rxjava2:rxjava:2.2.17' compile "com.github.akarnokd:rxjava2-swing:0.3.7" - compile 'com.android.tools.build:apksig:3.5.2' + compile 'com.android.tools.build:apksig:3.5.3' } application {