From a1247f4d963a00a7881d806386658b79091f613b Mon Sep 17 00:00:00 2001 From: Skylot Date: Wed, 17 Mar 2021 13:46:59 +0000 Subject: [PATCH] chore: update dependencies --- build.gradle | 12 ++++++------ jadx-cli/build.gradle | 2 +- jadx-core/build.gradle | 2 +- jadx-gui/build.gradle | 8 ++++---- jadx-plugins/jadx-dex-input/build.gradle | 4 ++-- .../jadx/plugins/input/dex/utils/SmaliUtils.java | 4 ++-- jadx-plugins/jadx-java-convert/build.gradle | 2 +- jadx-plugins/jadx-smali-input/build.gradle | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index b07632650..7cc6baab1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'com.github.ben-manes.versions' version '0.36.0' - id "com.diffplug.spotless" version "5.9.0" + id 'com.github.ben-manes.versions' version '0.38.0' + id "com.diffplug.spotless" version "5.11.0" } ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev" @@ -38,11 +38,11 @@ allprojects { testImplementation 'ch.qos.logback:logback-classic:1.2.3' testImplementation 'org.hamcrest:hamcrest-library:2.2' - testImplementation 'org.mockito:mockito-core:3.7.0' - testImplementation 'org.assertj:assertj-core:3.18.1' + testImplementation 'org.mockito:mockito-core:3.8.0' + testImplementation 'org.assertj:assertj-core:3.19.0' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.1' testImplementation 'org.eclipse.jdt.core.compiler:ecj:4.6.1' testCompileOnly 'org.jetbrains:annotations:20.1.0' diff --git a/jadx-cli/build.gradle b/jadx-cli/build.gradle index e0e77ee50..4b2e4030c 100644 --- a/jadx-cli/build.gradle +++ b/jadx-cli/build.gradle @@ -9,7 +9,7 @@ dependencies { runtimeOnly(project(':jadx-plugins:jadx-smali-input')) runtimeOnly(project(':jadx-plugins:jadx-java-convert')) - implementation 'com.beust:jcommander:1.78' + implementation 'com.beust:jcommander:1.81' implementation 'ch.qos.logback:logback-classic:1.2.3' } diff --git a/jadx-core/build.gradle b/jadx-core/build.gradle index c1421c143..c5db67945 100644 --- a/jadx-core/build.gradle +++ b/jadx-core/build.gradle @@ -8,7 +8,7 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.6' implementation 'com.android.tools.build:aapt2-proto:4.1.2-6503028' - testImplementation 'org.apache.commons:commons-lang3:3.11' + testImplementation 'org.apache.commons:commons-lang3:3.12.0' testRuntimeOnly(project(':jadx-plugins:jadx-dex-input')) testRuntimeOnly(project(':jadx-plugins:jadx-smali-input')) diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle index 0a8ac6e30..703073f7e 100644 --- a/jadx-gui/build.gradle +++ b/jadx-gui/build.gradle @@ -8,7 +8,7 @@ dependencies { implementation(project(':jadx-core')) implementation(project(":jadx-cli")) - implementation 'com.beust:jcommander:1.78' + implementation 'com.beust:jcommander:1.81' implementation 'ch.qos.logback:logback-classic:1.2.3' implementation 'com.fifesoft:rsyntaxtextarea:3.1.2' @@ -16,12 +16,12 @@ dependencies { implementation 'hu.kazocsaba:image-viewer:1.2.3' implementation 'com.google.code.gson:gson:2.8.6' - implementation 'org.apache.commons:commons-lang3:3.11' + implementation 'org.apache.commons:commons-lang3:3.12.0' implementation 'org.apache.commons:commons-text:1.9' - implementation 'io.reactivex.rxjava2:rxjava:2.2.20' + implementation 'io.reactivex.rxjava2:rxjava:2.2.21' implementation "com.github.akarnokd:rxjava2-swing:0.3.7" - implementation 'com.android.tools.build:apksig:4.1.1' + implementation 'com.android.tools.build:apksig:4.1.2' } application { diff --git a/jadx-plugins/jadx-dex-input/build.gradle b/jadx-plugins/jadx-dex-input/build.gradle index 9890a5846..344dfef78 100644 --- a/jadx-plugins/jadx-dex-input/build.gradle +++ b/jadx-plugins/jadx-dex-input/build.gradle @@ -6,8 +6,8 @@ dependencies { api(project(":jadx-plugins:jadx-plugins-api")) // TODO: finish own smali printer - implementation 'org.smali:baksmali:2.4.0' + implementation 'org.smali:baksmali:2.5.2' implementation 'com.google.guava:guava:30.1-jre' // force latest version for smali - testImplementation 'org.smali:smali:2.4.0' // compile smali files in tests + testImplementation 'org.smali:smali:2.5.2' // compile smali files in tests } diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/SmaliUtils.java b/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/SmaliUtils.java index 8ee09599b..88ddd6fb9 100644 --- a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/SmaliUtils.java +++ b/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/SmaliUtils.java @@ -5,9 +5,9 @@ import java.io.StringWriter; import org.jf.baksmali.Adaptors.ClassDefinition; import org.jf.baksmali.BaksmaliOptions; +import org.jf.baksmali.formatter.BaksmaliWriter; import org.jf.dexlib2.dexbacked.DexBackedClassDef; import org.jf.dexlib2.dexbacked.DexBackedDexFile; -import org.jf.util.IndentingWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,7 +20,7 @@ public class SmaliUtils { DexBackedDexFile dexFile = new DexBackedDexFile(null, dexBuf); DexBackedClassDef dexBackedClassDef = new DexBackedClassDef(dexFile, clsDefOffset, 0); ClassDefinition classDefinition = new ClassDefinition(new BaksmaliOptions(), dexBackedClassDef); - classDefinition.writeTo(new IndentingWriter(stringWriter)); + classDefinition.writeTo(new BaksmaliWriter(stringWriter)); } catch (Exception e) { LOG.error("Error generating smali", e); stringWriter.append("Error generating smali code: "); diff --git a/jadx-plugins/jadx-java-convert/build.gradle b/jadx-plugins/jadx-java-convert/build.gradle index 6f0ab6598..5fbcbb841 100644 --- a/jadx-plugins/jadx-java-convert/build.gradle +++ b/jadx-plugins/jadx-java-convert/build.gradle @@ -8,5 +8,5 @@ dependencies { implementation(project(":jadx-plugins:jadx-dex-input")) implementation(files('lib/dx-1.16.jar')) - implementation 'org.ow2.asm:asm:9.0' + implementation 'org.ow2.asm:asm:9.1' } diff --git a/jadx-plugins/jadx-smali-input/build.gradle b/jadx-plugins/jadx-smali-input/build.gradle index 6ac8a585f..ff1ec09e6 100644 --- a/jadx-plugins/jadx-smali-input/build.gradle +++ b/jadx-plugins/jadx-smali-input/build.gradle @@ -7,6 +7,6 @@ dependencies { implementation(project(":jadx-plugins:jadx-dex-input")) - implementation 'org.smali:smali:2.4.0' + implementation 'org.smali:smali:2.5.2' implementation 'com.google.guava:guava:30.1-jre' // force latest version for smali }