diff --git a/build.gradle.kts b/build.gradle.kts index 99ec0cb46..7e4d28a96 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform import java.util.Locale plugins { - id("com.github.ben-manes.versions") version "0.51.0" + id("com.github.ben-manes.versions") version "0.52.0" id("se.patrikerdes.use-latest-versions") version "0.2.18" id("com.diffplug.spotless") version "6.25.0" } diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts index 93ea7e4ea..2bb1a5f37 100644 --- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts +++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts @@ -14,16 +14,16 @@ group = "io.github.skylot" version = jadxVersion dependencies { - implementation("org.slf4j:slf4j-api:2.0.16") - compileOnly("org.jetbrains:annotations:26.0.1") + implementation("org.slf4j:slf4j-api:2.0.17") + compileOnly("org.jetbrains:annotations:26.0.2") - testImplementation("ch.qos.logback:logback-classic:1.5.16") - testImplementation("org.assertj:assertj-core:3.27.2") + testImplementation("ch.qos.logback:logback-classic:1.5.18") + testImplementation("org.assertj:assertj-core:3.27.3") - testImplementation("org.junit.jupiter:junit-jupiter:5.11.4") + testImplementation("org.junit.jupiter:junit-jupiter:5.12.1") testRuntimeOnly("org.junit.platform:junit-platform-launcher") - testCompileOnly("org.jetbrains:annotations:26.0.1") + testCompileOnly("org.jetbrains:annotations:26.0.2") } repositories { diff --git a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts b/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts index d9dc1a5f2..f3ba6e939 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.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") + rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.4.0") + rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.4.0") + rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.4.0") + rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.4.0") } tasks { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b953..9bbc975c7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1b837a19..36e4933e1 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=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f3b75f3b0..faf93008b 100755 --- a/gradlew +++ b/gradlew @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. diff --git a/jadx-cli/build.gradle.kts b/jadx-cli/build.gradle.kts index b5a4dc82a..501669dcc 100644 --- a/jadx-cli/build.gradle.kts +++ b/jadx-cli/build.gradle.kts @@ -4,7 +4,7 @@ plugins { id("application") // use shadow only for application scripts, jar will be copied from jadx-gui - id("com.gradleup.shadow") version "8.3.5" + id("com.gradleup.shadow") version "8.3.6" } dependencies { @@ -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.16") + implementation("ch.qos.logback:logback-classic:1.5.18") } application { diff --git a/jadx-core/build.gradle.kts b/jadx-core/build.gradle.kts index c49449c1b..f559e6cf0 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.11.0") + implementation("com.google.code.gson:gson:2.12.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 658775881..f6d7f1ba6 100644 --- a/jadx-gui/build.gradle.kts +++ b/jadx-gui/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("application") id("jadx-library") id("edu.sc.seis.launch4j") version "3.0.6" - id("com.gradleup.shadow") version "8.3.5" + id("com.gradleup.shadow") version "8.3.6" id("org.beryx.runtime") version "1.13.1" } @@ -20,17 +20,17 @@ dependencies { implementation(project(":jadx-plugins:jadx-script:jadx-script-ide")) implementation(project(":jadx-plugins:jadx-script:jadx-script-runtime")) implementation(kotlin("scripting-common")) - implementation("com.fifesoft:autocomplete:3.3.1") + implementation("com.fifesoft:autocomplete:3.3.2") // use KtLint for format and check jadx scripts implementation("com.pinterest.ktlint:ktlint-rule-engine:1.5.0") implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.5.0") implementation("org.jcommander:jcommander:2.0") - implementation("ch.qos.logback:logback-classic:1.5.16") - implementation("io.github.oshai:kotlin-logging-jvm:7.0.3") + implementation("ch.qos.logback:logback-classic:1.5.18") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.5") - implementation("com.fifesoft:rsyntaxtextarea:3.5.3") + implementation("com.fifesoft:rsyntaxtextarea:3.6.0") implementation("org.drjekyll:fontchooser:3.1.0") implementation("hu.kazocsaba:image-viewer:1.2.3") implementation("com.twelvemonkeys.imageio:imageio-webp:3.12.0") // WebP support for image viewer @@ -39,14 +39,14 @@ dependencies { implementation("com.formdev:flatlaf-intellij-themes:3.5.4") implementation("com.formdev:flatlaf-extras:3.5.4") - implementation("com.google.code.gson:gson:2.11.0") + implementation("com.google.code.gson:gson:2.12.1") implementation("org.apache.commons:commons-lang3:3.17.0") implementation("org.apache.commons:commons-text:1.13.0") implementation("commons-io:commons-io:2.18.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.8.0") + implementation("com.android.tools.build:apksig:8.9.0") 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 7250f73be..0a6a34c20 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.11.0") + implementation("com.google.code.gson:gson:2.12.1") } diff --git a/jadx-plugins/jadx-aab-input/build.gradle.kts b/jadx-plugins/jadx-aab-input/build.gradle.kts index 97b93aa65..8dfd9a2df 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.8.0-12006047") + implementation("com.android.tools.build:aapt2-proto:8.9.0-12782657") implementation("com.google.protobuf:protobuf-java") { version { require("3.25.3") // version 4 conflict with `aapt2-proto` } } - implementation("com.android.tools.build:bundletool:1.18.0") { + implementation("com.android.tools.build:bundletool:1.18.1") { // 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-apkm-input/build.gradle.kts b/jadx-plugins/jadx-apkm-input/build.gradle.kts index 58ea804a2..2e1dfee8a 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.11.0") + implementation("com.google.code.gson:gson:2.12.1") } diff --git a/jadx-plugins/jadx-rename-mappings/build.gradle.kts b/jadx-plugins/jadx-rename-mappings/build.gradle.kts index f3bc48e9b..6ba365152 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.7.0") { + api("net.fabricmc:mapping-io:0.7.1") { exclude("org.ow2.asm:asm") exclude("net.fabricmc:tiny-remapper") } diff --git a/jadx-plugins/jadx-script/examples/build.gradle.kts b/jadx-plugins/jadx-script/examples/build.gradle.kts index b77d745b6..8283b16be 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.3") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.5") // 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 2dfefe493..854d6a67e 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.1") - implementation("io.github.oshai:kotlin-logging-jvm:7.0.3") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.5") } 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 b3b0c0e57..a9e631962 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.3") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.5") 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 4b5a9bd43..dfc77067c 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.1") - implementation("io.github.oshai:kotlin-logging-jvm:7.0.3") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.5") 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 58ea804a2..2e1dfee8a 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.11.0") + implementation("com.google.code.gson:gson:2.12.1") }