From 03052baabe5f3ea63b5e38a7966a576dce3dbed8 Mon Sep 17 00:00:00 2001 From: Skylot Date: Thu, 11 Jan 2024 19:10:44 +0000 Subject: [PATCH] chore: update dependencies --- buildSrc/src/main/kotlin/jadx-java.gradle.kts | 4 ++-- jadx-core/build.gradle.kts | 4 ++-- jadx-gui/build.gradle.kts | 12 ++++++------ jadx-plugins/jadx-java-convert/build.gradle.kts | 4 ++-- jadx-plugins/jadx-kotlin-metadata/build.gradle.kts | 2 +- jadx-plugins/jadx-script/examples/build.gradle.kts | 2 +- .../jadx-script/jadx-script-ide/build.gradle.kts | 2 +- .../jadx-script/jadx-script-plugin/build.gradle.kts | 2 +- .../jadx-script/jadx-script-runtime/build.gradle.kts | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts index 4a1e93a1474..5e2db011833 100644 --- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts +++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts @@ -11,13 +11,13 @@ group = "io.github.skylot" version = jadxVersion dependencies { - implementation("org.slf4j:slf4j-api:2.0.9") + implementation("org.slf4j:slf4j-api:2.0.11") compileOnly("org.jetbrains:annotations:24.1.0") testImplementation("ch.qos.logback:logback-classic:1.4.14") testImplementation("org.hamcrest:hamcrest-library:2.2") testImplementation("org.mockito:mockito-core:5.8.0") - testImplementation("org.assertj:assertj-core:3.24.2") + testImplementation("org.assertj:assertj-core:3.25.1") testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") testRuntimeOnly("org.junit.platform:junit-platform-launcher") diff --git a/jadx-core/build.gradle.kts b/jadx-core/build.gradle.kts index e8b16fdf3f2..0c818442d9d 100644 --- a/jadx-core/build.gradle.kts +++ b/jadx-core/build.gradle.kts @@ -8,8 +8,8 @@ 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.0-10154469") - implementation("com.google.protobuf:protobuf-java:3.25.1") // forcing latest version + implementation("com.android.tools.build:aapt2-proto:8.2.1-10154469") + implementation("com.google.protobuf:protobuf-java:3.25.2") // forcing latest version testImplementation("org.apache.commons:commons-lang3:3.14.0") diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts index 4fb88ccb9f4..6de83576e22 100644 --- a/jadx-gui/build.gradle.kts +++ b/jadx-gui/build.gradle.kts @@ -21,8 +21,8 @@ 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.0") - implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.1.0") + implementation("com.pinterest.ktlint:ktlint-rule-engine:1.1.1") + implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.1.1") implementation("org.jcommander:jcommander:1.83") implementation("ch.qos.logback:logback-classic:1.4.14") @@ -32,9 +32,9 @@ dependencies { implementation(files("libs/jfontchooser-1.0.5.jar")) implementation("hu.kazocsaba:image-viewer:1.2.3") - implementation("com.formdev:flatlaf:3.2.5") - implementation("com.formdev:flatlaf-intellij-themes:3.2.5") - implementation("com.formdev:flatlaf-extras:3.2.5") + implementation("com.formdev:flatlaf:3.3") + implementation("com.formdev:flatlaf-intellij-themes:3.3") + implementation("com.formdev:flatlaf-extras:3.3") implementation("com.google.code.gson:gson:2.10.1") implementation("org.apache.commons:commons-lang3:3.14.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.0") + implementation("com.android.tools.build:apksig:8.2.1") implementation("io.github.skylot:jdwp:2.0.0") testImplementation(project(":jadx-core").dependencyProject.sourceSets.getByName("test").output) diff --git a/jadx-plugins/jadx-java-convert/build.gradle.kts b/jadx-plugins/jadx-java-convert/build.gradle.kts index 5dc4122d850..71a9c6fee31 100644 --- a/jadx-plugins/jadx-java-convert/build.gradle.kts +++ b/jadx-plugins/jadx-java-convert/build.gradle.kts @@ -6,8 +6,8 @@ dependencies { api(project(":jadx-core")) implementation(project(":jadx-plugins:jadx-dex-input")) - implementation("com.jakewharton.android.repackaged:dalvik-dx:11.0.0_r3") - implementation("com.android.tools:r8:8.2.33") + implementation("com.jakewharton.android.repackaged:dalvik-dx:14.0.0_r21") + implementation("com.android.tools:r8:8.2.42") implementation("org.ow2.asm:asm:9.6") } diff --git a/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts b/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts index 9192d294027..579250849b0 100644 --- a/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts +++ b/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { api(project(":jadx-core")) - implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.9.0") testImplementation(project(":jadx-core").dependencyProject.sourceSets.test.get().output) testImplementation("org.apache.commons:commons-lang3:3.14.0") diff --git a/jadx-plugins/jadx-script/examples/build.gradle.kts b/jadx-plugins/jadx-script/examples/build.gradle.kts index ca1b750fe42..95ee9cbba36 100644 --- a/jadx-plugins/jadx-script/examples/build.gradle.kts +++ b/jadx-plugins/jadx-script/examples/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { implementation(kotlin("stdlib-common")) implementation(kotlin("script-runtime")) - implementation("io.github.oshai:kotlin-logging-jvm:6.0.1") + implementation("io.github.oshai:kotlin-logging-jvm:6.0.2") // script context support in IDE is poor, use stubs and manual imports for now // kotlinScriptDef(project(":jadx-plugins:jadx-script:jadx-script-runtime")) diff --git a/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts b/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts index 77a82e4dacb..fb871795547 100644 --- a/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts +++ b/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts @@ -12,5 +12,5 @@ dependencies { implementation(kotlin("scripting-ide-services")) implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") - implementation("io.github.oshai:kotlin-logging-jvm:6.0.1") + implementation("io.github.oshai:kotlin-logging-jvm:6.0.2") } diff --git a/jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts b/jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts index eecb184fe39..90c8d22cefb 100644 --- a/jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts +++ b/jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { implementation(kotlin("scripting-jvm")) implementation(kotlin("scripting-jvm-host")) - implementation("io.github.oshai:kotlin-logging-jvm:6.0.1") + implementation("io.github.oshai:kotlin-logging-jvm:6.0.2") // path for scripts cache implementation("dev.dirs:directories:26") diff --git a/jadx-plugins/jadx-script/jadx-script-runtime/build.gradle.kts b/jadx-plugins/jadx-script/jadx-script-runtime/build.gradle.kts index 0664c5ec68c..086665e90bf 100644 --- a/jadx-plugins/jadx-script/jadx-script-runtime/build.gradle.kts +++ b/jadx-plugins/jadx-script/jadx-script-runtime/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { implementation(kotlin("scripting-dependencies-maven")) implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") - implementation("io.github.oshai:kotlin-logging-jvm:6.0.1") + implementation("io.github.oshai:kotlin-logging-jvm:6.0.2") runtimeOnly(project(":jadx-plugins:jadx-dex-input")) runtimeOnly(project(":jadx-plugins:jadx-smali-input"))