From f81a2c4ebba878ae561f190784f766c82e0bab18 Mon Sep 17 00:00:00 2001 From: Skylot Date: Fri, 11 Aug 2023 17:36:14 +0100 Subject: [PATCH] chore: update dependencies --- buildSrc/src/main/kotlin/jadx-java.gradle.kts | 2 +- jadx-cli/build.gradle.kts | 2 +- jadx-core/build.gradle.kts | 4 ++-- jadx-gui/build.gradle.kts | 14 +++++++------- jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java | 2 +- jadx-plugins/jadx-java-convert/build.gradle.kts | 2 +- 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-plugin/build.gradle.kts | 2 +- .../jadx-script-runtime/build.gradle.kts | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts index 5655283ba..21fd8ec74 100644 --- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts +++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts @@ -14,7 +14,7 @@ dependencies { implementation("org.slf4j:slf4j-api:2.0.7") compileOnly("org.jetbrains:annotations:24.0.1") - testImplementation("ch.qos.logback:logback-classic:1.4.8") + testImplementation("ch.qos.logback:logback-classic:1.4.11") testImplementation("org.hamcrest:hamcrest-library:2.2") testImplementation("org.mockito:mockito-core:5.4.0") testImplementation("org.assertj:assertj-core:3.24.2") diff --git a/jadx-cli/build.gradle.kts b/jadx-cli/build.gradle.kts index aff5445df..b90903cd8 100644 --- a/jadx-cli/build.gradle.kts +++ b/jadx-cli/build.gradle.kts @@ -19,7 +19,7 @@ dependencies { runtimeOnly(project(":jadx-plugins:jadx-script:jadx-script-plugin")) implementation("com.beust:jcommander:1.82") - implementation("ch.qos.logback:logback-classic:1.4.8") + implementation("ch.qos.logback:logback-classic:1.4.11") } application { diff --git a/jadx-core/build.gradle.kts b/jadx-core/build.gradle.kts index 10a1cee22..01a61c969 100644 --- a/jadx-core/build.gradle.kts +++ b/jadx-core/build.gradle.kts @@ -9,9 +9,9 @@ dependencies { // TODO: move resources decoding to separate plugin module implementation("com.android.tools.build:aapt2-proto:8.1.0-10154469") - implementation("com.google.protobuf:protobuf-java:3.23.4") // forcing latest version + implementation("com.google.protobuf:protobuf-java:3.24.0") // forcing latest version - testImplementation("org.apache.commons:commons-lang3:3.12.0") + testImplementation("org.apache.commons:commons-lang3:3.13.0") testImplementation(project(":jadx-plugins:jadx-dex-input")) testRuntimeOnly(project(":jadx-plugins:jadx-smali-input")) diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts index 959f1e87d..4293fa208 100644 --- a/jadx-gui/build.gradle.kts +++ b/jadx-gui/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("jadx-kotlin") id("application") - id("edu.sc.seis.launch4j") version "3.0.3" + id("edu.sc.seis.launch4j") version "3.0.4" id("com.github.johnrengelman.shadow") version "8.1.1" id("org.beryx.runtime") version "1.13.0" } @@ -25,20 +25,20 @@ dependencies { implementation("com.pinterest.ktlint:ktlint-ruleset-standard:0.50.0") implementation("com.beust:jcommander:1.82") - implementation("ch.qos.logback:logback-classic:1.4.8") + implementation("ch.qos.logback:logback-classic:1.4.11") implementation("dev.dirs:directories:26") - implementation("com.fifesoft:rsyntaxtextarea:3.3.3") + implementation("com.fifesoft:rsyntaxtextarea:3.3.4") implementation(files("libs/jfontchooser-1.0.5.jar")) implementation("hu.kazocsaba:image-viewer:1.2.3") - implementation("com.formdev:flatlaf:3.1.1") - implementation("com.formdev:flatlaf-intellij-themes:3.1.1") - implementation("com.formdev:flatlaf-extras:3.1.1") + implementation("com.formdev:flatlaf:3.2") + implementation("com.formdev:flatlaf-intellij-themes:3.2") + implementation("com.formdev:flatlaf-extras:3.2") implementation("com.formdev:svgSalamander:1.1.4") implementation("com.google.code.gson:gson:2.10.1") - implementation("org.apache.commons:commons-lang3:3.12.0") + implementation("org.apache.commons:commons-lang3:3.13.0") implementation("org.apache.commons:commons-text:1.10.0") implementation("commons-io:commons-io:2.13.0") diff --git a/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java b/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java index 65c40e6c5..441f7d94b 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java @@ -632,7 +632,7 @@ public class MainWindow extends JFrame { public void updateProject(@NotNull JadxProject jadxProject) { this.project = jadxProject; - update(); + UiUtils.uiRun(this::update); } public void update() { diff --git a/jadx-plugins/jadx-java-convert/build.gradle.kts b/jadx-plugins/jadx-java-convert/build.gradle.kts index ef2339c3f..955b0bca8 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:11.0.0_r3") - implementation("com.android.tools:r8:8.0.40") + implementation("com.android.tools:r8:8.1.56") implementation("org.ow2.asm:asm:9.5") } diff --git a/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts b/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts index 37e749349..5c5533858 100644 --- a/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts +++ b/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.7.0") testImplementation(project(":jadx-core").dependencyProject.sourceSets.test.get().output) - testImplementation("org.apache.commons:commons-lang3:3.12.0") + testImplementation("org.apache.commons:commons-lang3:3.13.0") testRuntimeOnly(project(":jadx-plugins:jadx-smali-input")) } diff --git a/jadx-plugins/jadx-script/examples/build.gradle.kts b/jadx-plugins/jadx-script/examples/build.gradle.kts index 8360bbe7b..f391ff30f 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:5.0.1") + implementation("io.github.oshai:kotlin-logging-jvm:5.1.0") // 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 9ec2b62c3..c8d879573 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:5.0.1") + implementation("io.github.oshai:kotlin-logging-jvm:5.1.0") } 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 ebdde15c0..50884c5b2 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:5.0.1") + implementation("io.github.oshai:kotlin-logging-jvm:5.1.0") testImplementation(project(":jadx-core")) } 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 ac4f1efc0..0a6da3e92 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:5.0.1") + implementation("io.github.oshai:kotlin-logging-jvm:5.1.0") runtimeOnly(project(":jadx-plugins:jadx-dex-input")) runtimeOnly(project(":jadx-plugins:jadx-smali-input"))