From 94915db7399c634662787ebfb4709d5985fab17c Mon Sep 17 00:00:00 2001
From: Skylot <118523+skylot@users.noreply.github.com>
Date: Mon, 13 Jan 2025 19:52:58 +0000
Subject: [PATCH] chore: update gradle and dependencies

---
 buildSrc/src/main/kotlin/jadx-java.gradle.kts             | 4 ++--
 buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts          | 8 ++++----
 gradle/wrapper/gradle-wrapper.properties                  | 4 ++--
 gradlew                                                   | 3 +--
 jadx-cli/build.gradle.kts                                 | 2 +-
 jadx-gui/build.gradle.kts                                 | 4 ++--
 jadx-plugins/jadx-aab-input/build.gradle.kts              | 4 ++--
 jadx-plugins/jadx-dex-input/build.gradle.kts              | 4 ++--
 jadx-plugins/jadx-java-convert/build.gradle.kts           | 2 +-
 jadx-plugins/jadx-rename-mappings/build.gradle.kts        | 2 +-
 jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts | 2 +-
 .../jadx-script/jadx-script-runtime/build.gradle.kts      | 2 +-
 jadx-plugins/jadx-smali-input/build.gradle.kts            | 2 +-
 13 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
index ae87de05605..93ea7e4ea27 100644
--- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts
+++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
@@ -17,8 +17,8 @@ dependencies {
 	implementation("org.slf4j:slf4j-api:2.0.16")
 	compileOnly("org.jetbrains:annotations:26.0.1")
 
-	testImplementation("ch.qos.logback:logback-classic:1.5.13")
-	testImplementation("org.assertj:assertj-core:3.26.3")
+	testImplementation("ch.qos.logback:logback-classic:1.5.16")
+	testImplementation("org.assertj:assertj-core:3.27.2")
 
 	testImplementation("org.junit.jupiter:junit-jupiter:5.11.4")
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
diff --git a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts b/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
index 00bb803f24b..d9dc1a5f2f3 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:2.24.0")
-	rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:2.18.0")
-	rewrite("org.openrewrite.recipe:rewrite-migrate-java:2.31.0")
-	rewrite("org.openrewrite.recipe:rewrite-static-analysis:1.22.0")
+	rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.0.0")
+	rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.0.0")
+	rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.0.0")
+	rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.0.1")
 }
 
 tasks {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index eb1a55be0e1..e1b837a19c2 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=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d6b1..f3b75f3b0d4 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/jadx-cli/build.gradle.kts b/jadx-cli/build.gradle.kts
index 7aeac96cd99..208ecdcb0ff 100644
--- a/jadx-cli/build.gradle.kts
+++ b/jadx-cli/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
 	runtimeOnly(project(":jadx-plugins:jadx-apkm-input"))
 
 	implementation("org.jcommander:jcommander:2.0")
-	implementation("ch.qos.logback:logback-classic:1.5.13")
+	implementation("ch.qos.logback:logback-classic:1.5.16")
 }
 
 application {
diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts
index 715ef179225..c638de1d231 100644
--- a/jadx-gui/build.gradle.kts
+++ b/jadx-gui/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
 	implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.5.0")
 
 	implementation("org.jcommander:jcommander:2.0")
-	implementation("ch.qos.logback:logback-classic:1.5.13")
+	implementation("ch.qos.logback:logback-classic:1.5.16")
 	implementation("io.github.oshai:kotlin-logging-jvm:7.0.3")
 
 	implementation("com.fifesoft:rsyntaxtextarea:3.5.3")
@@ -46,7 +46,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.7.3")
+	implementation("com.android.tools.build:apksig:8.8.0")
 	implementation("io.github.skylot:jdwp:2.0.0")
 
 	testImplementation(project.project(":jadx-core").sourceSets.getByName("test").output)
diff --git a/jadx-plugins/jadx-aab-input/build.gradle.kts b/jadx-plugins/jadx-aab-input/build.gradle.kts
index 73d8dea7fbe..97b93aa65d1 100644
--- a/jadx-plugins/jadx-aab-input/build.gradle.kts
+++ b/jadx-plugins/jadx-aab-input/build.gradle.kts
@@ -5,14 +5,14 @@ plugins {
 dependencies {
 	compileOnly(project(":jadx-core"))
 
-	implementation("com.android.tools.build:aapt2-proto:8.7.3-12006047")
+	implementation("com.android.tools.build:aapt2-proto:8.8.0-12006047")
 	implementation("com.google.protobuf:protobuf-java") {
 		version {
 			require("3.25.3") // version 4 conflict with `aapt2-proto`
 		}
 	}
 
-	implementation("com.android.tools.build:bundletool:1.17.2") {
+	implementation("com.android.tools.build:bundletool:1.18.0") {
 		// All of this is unnecessary for parsing BundleConfig.pb except for protobuf
 		exclude(group = "com.android.tools.build")
 		exclude(group = "com.google.protobuf")
diff --git a/jadx-plugins/jadx-dex-input/build.gradle.kts b/jadx-plugins/jadx-dex-input/build.gradle.kts
index ae73acc02e3..38f553a5f0f 100644
--- a/jadx-plugins/jadx-dex-input/build.gradle.kts
+++ b/jadx-plugins/jadx-dex-input/build.gradle.kts
@@ -6,13 +6,13 @@ dependencies {
 	api(project(":jadx-core"))
 
 	// TODO: finish own smali printer
-	implementation("com.android.tools.smali:smali-baksmali:3.0.8") {
+	implementation("com.android.tools.smali:smali-baksmali:3.0.9") {
 		exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace
 	}
 	implementation("com.google.guava:guava:33.4.0-jre") // force the latest version for smali
 
 	// compile smali files in tests
-	testImplementation("com.android.tools.smali:smali:3.0.8") {
+	testImplementation("com.android.tools.smali:smali:3.0.9") {
 		exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace
 	}
 }
diff --git a/jadx-plugins/jadx-java-convert/build.gradle.kts b/jadx-plugins/jadx-java-convert/build.gradle.kts
index 9c77249afa2..7d7ddecbc88 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.5.35")
+	implementation("com.android.tools:r8:8.7.18")
 
 	implementation("org.ow2.asm:asm:9.7.1")
 }
diff --git a/jadx-plugins/jadx-rename-mappings/build.gradle.kts b/jadx-plugins/jadx-rename-mappings/build.gradle.kts
index 258868de1ce..f3bc48e9b72 100644
--- a/jadx-plugins/jadx-rename-mappings/build.gradle.kts
+++ b/jadx-plugins/jadx-rename-mappings/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 dependencies {
 	api(project(":jadx-core"))
 
-	api("net.fabricmc:mapping-io:0.6.1") {
+	api("net.fabricmc:mapping-io:0.7.0") {
 		exclude("org.ow2.asm:asm")
 		exclude("net.fabricmc:tiny-remapper")
 	}
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 26e656e5d5a..2dfefe493f4 100644
--- a/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts
+++ b/jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts
@@ -12,6 +12,6 @@ dependencies {
 	implementation(kotlin("scripting-compiler-embeddable"))
 	implementation(kotlin("scripting-ide-services"))
 
-	implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
+	implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
 	implementation("io.github.oshai:kotlin-logging-jvm:7.0.3")
 }
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 a88209a5d52..4b5a9bd43ce 100644
--- a/jadx-plugins/jadx-script/jadx-script-runtime/build.gradle.kts
+++ b/jadx-plugins/jadx-script/jadx-script-runtime/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
 	implementation(kotlin("scripting-dependencies"))
 	implementation(kotlin("scripting-dependencies-maven"))
 
-	implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
+	implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
 	implementation("io.github.oshai:kotlin-logging-jvm:7.0.3")
 
 	runtimeOnly(project(":jadx-plugins:jadx-dex-input"))
diff --git a/jadx-plugins/jadx-smali-input/build.gradle.kts b/jadx-plugins/jadx-smali-input/build.gradle.kts
index 8d40b9c0111..5cd3fe997f3 100644
--- a/jadx-plugins/jadx-smali-input/build.gradle.kts
+++ b/jadx-plugins/jadx-smali-input/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
 
 	implementation(project(":jadx-plugins:jadx-dex-input"))
 
-	implementation("com.android.tools.smali:smali:3.0.8") {
+	implementation("com.android.tools.smali:smali:3.0.9") {
 		exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace
 	}
 	implementation("com.google.guava:guava:33.4.0-jre") // force the latest version for smali