diff --git a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts b/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts index 60944084f..c656bdb23 100644 --- a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts +++ b/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts @@ -7,10 +7,10 @@ repositories { } dependencies { - rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.6.1") - rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.6.1") - rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.7.0") - rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.7.1") + rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.7.0") + rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.7.0") + rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.8.0") + rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.8.0") } tasks { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 36e4933e1..247cf2a9f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/jadx-core/build.gradle.kts b/jadx-core/build.gradle.kts index 55620c6b4..1aa521362 100644 --- a/jadx-core/build.gradle.kts +++ b/jadx-core/build.gradle.kts @@ -6,7 +6,7 @@ dependencies { api(project(":jadx-plugins:jadx-input-api")) api(project(":jadx-commons:jadx-zip")) - implementation("com.google.code.gson:gson:2.13.0") + implementation("com.google.code.gson:gson:2.13.1") testImplementation("org.apache.commons:commons-lang3:3.17.0") diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts index f2d4b8694..e6b916294 100644 --- a/jadx-gui/build.gradle.kts +++ b/jadx-gui/build.gradle.kts @@ -28,7 +28,7 @@ dependencies { implementation("org.jcommander:jcommander:2.0") implementation("ch.qos.logback:logback-classic:1.5.18") - implementation("io.github.oshai:kotlin-logging-jvm:7.0.6") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.7") implementation("com.fifesoft:rsyntaxtextarea:3.6.0") implementation("org.drjekyll:fontchooser:3.1.0") @@ -39,14 +39,14 @@ dependencies { implementation("com.formdev:flatlaf-intellij-themes:3.6") implementation("com.formdev:flatlaf-extras:3.6") - implementation("com.google.code.gson:gson:2.13.0") + implementation("com.google.code.gson:gson:2.13.1") implementation("org.apache.commons:commons-lang3:3.17.0") implementation("org.apache.commons:commons-text:1.13.1") implementation("commons-io:commons-io:2.19.0") implementation("io.reactivex.rxjava2:rxjava:2.2.21") implementation("com.github.akarnokd:rxjava2-swing:0.3.7") - implementation("com.android.tools.build:apksig:8.9.1") + implementation("com.android.tools.build:apksig:8.9.2") implementation("io.github.skylot:jdwp:2.0.0") testImplementation(project.project(":jadx-core").sourceSets.getByName("test").output) diff --git a/jadx-plugins-tools/build.gradle.kts b/jadx-plugins-tools/build.gradle.kts index e0dc88ec5..6288354e7 100644 --- a/jadx-plugins-tools/build.gradle.kts +++ b/jadx-plugins-tools/build.gradle.kts @@ -7,5 +7,5 @@ dependencies { implementation(project(":jadx-commons:jadx-app-commons")) - implementation("com.google.code.gson:gson:2.13.0") + implementation("com.google.code.gson:gson:2.13.1") } diff --git a/jadx-plugins/jadx-aab-input/build.gradle.kts b/jadx-plugins/jadx-aab-input/build.gradle.kts index 5668c5fa8..cdde76637 100644 --- a/jadx-plugins/jadx-aab-input/build.gradle.kts +++ b/jadx-plugins/jadx-aab-input/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { compileOnly(project(":jadx-core")) - implementation("com.android.tools.build:aapt2-proto:8.9.1-12782657") + implementation("com.android.tools.build:aapt2-proto:8.9.2-12782657") implementation("com.google.protobuf:protobuf-java") { version { require("3.25.3") // version 4 conflict with `aapt2-proto` diff --git a/jadx-plugins/jadx-apkm-input/build.gradle.kts b/jadx-plugins/jadx-apkm-input/build.gradle.kts index cc1302b74..9bfa50e1e 100644 --- a/jadx-plugins/jadx-apkm-input/build.gradle.kts +++ b/jadx-plugins/jadx-apkm-input/build.gradle.kts @@ -7,5 +7,5 @@ dependencies { api(project(":jadx-core")) implementation(project(":jadx-plugins:jadx-dex-input")) - implementation("com.google.code.gson:gson:2.13.0") + implementation("com.google.code.gson:gson:2.13.1") } diff --git a/jadx-plugins/jadx-java-convert/build.gradle.kts b/jadx-plugins/jadx-java-convert/build.gradle.kts index 60490a076..daf171346 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.7.18") + implementation("com.android.tools:r8:8.9.35") implementation("org.ow2.asm:asm:9.8") } diff --git a/jadx-plugins/jadx-script/examples/build.gradle.kts b/jadx-plugins/jadx-script/examples/build.gradle.kts index 17d562ba0..2fa5432aa 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:7.0.6") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.7") // 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 37328942b..f2c281e3b 100644 --- a/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts +++ b/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts @@ -13,5 +13,5 @@ dependencies { implementation(kotlin("scripting-ide-services")) implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2") - implementation("io.github.oshai:kotlin-logging-jvm:7.0.6") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.7") } 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 8d1addd1c..3c03d37ef 100644 --- a/jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts +++ b/jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { implementation(kotlin("scripting-jvm")) implementation(kotlin("scripting-jvm-host")) - implementation("io.github.oshai:kotlin-logging-jvm:7.0.6") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.7") 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 02bf0da35..4659355bb 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.10.2") - implementation("io.github.oshai:kotlin-logging-jvm:7.0.6") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.7") runtimeOnly(project(":jadx-plugins:jadx-dex-input")) runtimeOnly(project(":jadx-plugins:jadx-smali-input")) diff --git a/jadx-plugins/jadx-xapk-input/build.gradle.kts b/jadx-plugins/jadx-xapk-input/build.gradle.kts index cc1302b74..9bfa50e1e 100644 --- a/jadx-plugins/jadx-xapk-input/build.gradle.kts +++ b/jadx-plugins/jadx-xapk-input/build.gradle.kts @@ -7,5 +7,5 @@ dependencies { api(project(":jadx-core")) implementation(project(":jadx-plugins:jadx-dex-input")) - implementation("com.google.code.gson:gson:2.13.0") + implementation("com.google.code.gson:gson:2.13.1") }