From 49d2b34d84515f48947ebd2e61ea316c93684d57 Mon Sep 17 00:00:00 2001 From: Skylot Date: Sat, 16 Mar 2024 16:20:00 +0000 Subject: [PATCH] chore: update dependencies --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/jadx-java.gradle.kts | 4 ++-- jadx-cli/build.gradle.kts | 2 +- jadx-core/build.gradle.kts | 8 ++++++-- jadx-gui/build.gradle.kts | 8 ++++---- jadx-plugins/jadx-dex-input/build.gradle.kts | 2 +- jadx-plugins/jadx-java-convert/build.gradle.kts | 2 +- jadx-plugins/jadx-smali-input/build.gradle.kts | 2 +- 8 files changed, 17 insertions(+), 13 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 23bd775e4ad..1627831772c 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23") } repositories { diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts index 5f804adede6..3f4d89531f1 100644 --- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts +++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts @@ -14,9 +14,9 @@ dependencies { implementation("org.slf4j:slf4j-api:2.0.12") compileOnly("org.jetbrains:annotations:24.1.0") - testImplementation("ch.qos.logback:logback-classic:1.5.0") + testImplementation("ch.qos.logback:logback-classic:1.5.3") testImplementation("org.hamcrest:hamcrest-library:2.2") - testImplementation("org.mockito:mockito-core:5.10.0") + testImplementation("org.mockito:mockito-core:5.11.0") testImplementation("org.assertj:assertj-core:3.25.3") testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") diff --git a/jadx-cli/build.gradle.kts b/jadx-cli/build.gradle.kts index f147fd12d46..c51ff1935d9 100644 --- a/jadx-cli/build.gradle.kts +++ b/jadx-cli/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { runtimeOnly(project(":jadx-plugins:jadx-xapk-input")) implementation("org.jcommander:jcommander:1.83") - implementation("ch.qos.logback:logback-classic:1.5.0") + implementation("ch.qos.logback:logback-classic:1.5.3") } application { diff --git a/jadx-core/build.gradle.kts b/jadx-core/build.gradle.kts index 3d50e21fb50..769b72da92f 100644 --- a/jadx-core/build.gradle.kts +++ b/jadx-core/build.gradle.kts @@ -8,8 +8,12 @@ dependencies { implementation("com.google.code.gson:gson:2.10.1") // TODO: move resources decoding to separate plugin module - implementation("com.android.tools.build:aapt2-proto:8.2.2-10154469") - implementation("com.google.protobuf:protobuf-java:3.25.3") // forcing latest version + implementation("com.android.tools.build:aapt2-proto:8.3.0-10880808") + implementation("com.google.protobuf:protobuf-java") { + version { + require("3.25.3") // version 4 conflict with `aapt2-proto` + } + } testImplementation("org.apache.commons:commons-lang3:3.14.0") diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts index f269a8b4c85..3fcb894eae2 100644 --- a/jadx-gui/build.gradle.kts +++ b/jadx-gui/build.gradle.kts @@ -21,11 +21,11 @@ dependencies { implementation("com.fifesoft:autocomplete:3.3.1") // use KtLint for format and check jadx scripts - implementation("com.pinterest.ktlint:ktlint-rule-engine:1.1.1") - implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.1.1") + implementation("com.pinterest.ktlint:ktlint-rule-engine:1.2.1") + implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.2.1") implementation("org.jcommander:jcommander:1.83") - implementation("ch.qos.logback:logback-classic:1.5.0") + implementation("ch.qos.logback:logback-classic:1.5.3") implementation("dev.dirs:directories:26") implementation("com.fifesoft:rsyntaxtextarea:3.4.0") @@ -43,7 +43,7 @@ dependencies { implementation("io.reactivex.rxjava2:rxjava:2.2.21") implementation("com.github.akarnokd:rxjava2-swing:0.3.7") - implementation("com.android.tools.build:apksig:8.2.2") + implementation("com.android.tools.build:apksig:8.3.0") implementation("io.github.skylot:jdwp:2.0.0") testImplementation(project(":jadx-core").dependencyProject.sourceSets.getByName("test").output) diff --git a/jadx-plugins/jadx-dex-input/build.gradle.kts b/jadx-plugins/jadx-dex-input/build.gradle.kts index dd9b7789006..a98a887f14a 100644 --- a/jadx-plugins/jadx-dex-input/build.gradle.kts +++ b/jadx-plugins/jadx-dex-input/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { implementation("com.android.tools.smali:smali-baksmali:3.0.5") { exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace } - implementation("com.google.guava:guava:33.0.0-jre") // force the latest version for smali + implementation("com.google.guava:guava:33.1.0-jre") // force the latest version for smali // compile smali files in tests testImplementation("com.android.tools.smali:smali:3.0.5") { diff --git a/jadx-plugins/jadx-java-convert/build.gradle.kts b/jadx-plugins/jadx-java-convert/build.gradle.kts index 5042f6c13bd..38d83b7f598 100644 --- a/jadx-plugins/jadx-java-convert/build.gradle.kts +++ b/jadx-plugins/jadx-java-convert/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { implementation(project(":jadx-plugins:jadx-dex-input")) implementation("com.jakewharton.android.repackaged:dalvik-dx:14.0.0_r21") - implementation("com.android.tools:r8:8.2.47") + implementation("com.android.tools:r8:8.3.37") implementation("org.ow2.asm:asm:9.6") } diff --git a/jadx-plugins/jadx-smali-input/build.gradle.kts b/jadx-plugins/jadx-smali-input/build.gradle.kts index 4d1ae3a9925..fa000b2bd19 100644 --- a/jadx-plugins/jadx-smali-input/build.gradle.kts +++ b/jadx-plugins/jadx-smali-input/build.gradle.kts @@ -10,5 +10,5 @@ dependencies { implementation("com.android.tools.smali:smali:3.0.5") { exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace } - implementation("com.google.guava:guava:33.0.0-jre") // force the latest version for smali + implementation("com.google.guava:guava:33.1.0-jre") // force the latest version for smali }