From 6433fcef72af4bdae2a91a5326c5683b2dd717c4 Mon Sep 17 00:00:00 2001 From: Skylot Date: Sat, 7 Oct 2023 18:07:56 +0100 Subject: [PATCH] chore: update gradle and dependencies --- build.gradle.kts | 2 +- buildSrc/src/main/kotlin/jadx-java.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +-- jadx-cli/build.gradle.kts | 12 ++++--- jadx-core/build.gradle.kts | 4 +-- jadx-gui/build.gradle.kts | 33 ++++++++++--------- .../jadx-java-convert/build.gradle.kts | 2 +- 7 files changed, 32 insertions(+), 27 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 14d1f93f9..2af8bf7b4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ import java.util.Locale plugins { id("com.github.ben-manes.versions") version "0.48.0" id("se.patrikerdes.use-latest-versions") version "0.2.18" - id("com.diffplug.spotless") version "6.21.0" + id("com.diffplug.spotless") version "6.22.0" } val jadxVersion by extra { System.getenv("JADX_VERSION") ?: "dev" } diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts index dc2dd8ab4..4deb0f3d4 100644 --- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts +++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts @@ -16,7 +16,7 @@ dependencies { testImplementation("ch.qos.logback:logback-classic:1.4.11") testImplementation("org.hamcrest:hamcrest-library:2.2") - testImplementation("org.mockito:mockito-core:5.5.0") + testImplementation("org.mockito:mockito-core:5.6.0") testImplementation("org.assertj:assertj-core:3.24.2") testImplementation("org.junit.jupiter:junit-jupiter:5.10.0") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 864d6c475..46671acb6 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=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/jadx-cli/build.gradle.kts b/jadx-cli/build.gradle.kts index b90903cd8..0c9dd1a53 100644 --- a/jadx-cli/build.gradle.kts +++ b/jadx-cli/build.gradle.kts @@ -25,11 +25,13 @@ dependencies { application { applicationName = "jadx" mainClass.set("jadx.cli.JadxCLI") - applicationDefaultJvmArgs = listOf( - "-Xms256M", - "-XX:MaxRAMPercentage=70.0", - "-Djdk.util.zip.disableZip64ExtraFieldValidation=true", // disable zip checks (#1962) - ) + applicationDefaultJvmArgs = + listOf( + "-Xms256M", + "-XX:MaxRAMPercentage=70.0", + // disable zip checks (#1962) + "-Djdk.util.zip.disableZip64ExtraFieldValidation=true", + ) applicationDistribution.from("$rootDir") { include("README.md") include("NOTICE") diff --git a/jadx-core/build.gradle.kts b/jadx-core/build.gradle.kts index 7f6423797..30e9463cf 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.1.1-10154469") - implementation("com.google.protobuf:protobuf-java:3.24.3") // forcing latest version + implementation("com.android.tools.build:aapt2-proto:8.1.2-10154469") + implementation("com.google.protobuf:protobuf-java:3.24.4") // forcing latest version testImplementation("org.apache.commons:commons-lang3:3.13.0") diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts index 36c1533d5..89713f951 100644 --- a/jadx-gui/build.gradle.kts +++ b/jadx-gui/build.gradle.kts @@ -40,11 +40,11 @@ dependencies { implementation("com.google.code.gson:gson:2.10.1") 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") + implementation("commons-io:commons-io:2.14.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.1.1") + implementation("com.android.tools.build:apksig:8.1.2") implementation("io.github.skylot:jdwp:2.0.0") testImplementation(project(":jadx-core").dependencyProject.sourceSets.getByName("test").output) @@ -59,16 +59,18 @@ tasks.test { application { applicationName = ("jadx-gui") mainClass.set("jadx.gui.JadxGUI") - applicationDefaultJvmArgs = listOf( - "-Xms128M", - "-XX:MaxRAMPercentage=70.0", - "-Dawt.useSystemAAFontSettings=lcd", - "-Dswing.aatext=true", - "-Djava.util.Arrays.useLegacyMergeSort=true", - "-Djdk.util.zip.disableZip64ExtraFieldValidation=true", // disable zip checks (#1962) - "-XX:+IgnoreUnrecognizedVMOptions", - "--add-opens=java.base/java.lang=ALL-UNNAMED", // for ktlint formatter - ) + applicationDefaultJvmArgs = + listOf( + "-Xms128M", + "-XX:MaxRAMPercentage=70.0", + "-Dawt.useSystemAAFontSettings=lcd", + "-Dswing.aatext=true", + "-Djava.util.Arrays.useLegacyMergeSort=true", + // disable zip checks (#1962) + "-Djdk.util.zip.disableZip64ExtraFieldValidation=true", + // needed for ktlint formatter + "-XX:+IgnoreUnrecognizedVMOptions", "--add-opens=java.base/java.lang=ALL-UNNAMED", + ) applicationDistribution.from("$rootDir") { include("README.md") include("NOTICE") @@ -91,9 +93,10 @@ tasks.shadowJar { tasks.existing(CreateStartScripts::class) { doLast { - val newContent = windowsScript.readText() - .replace("java.exe", "javaw.exe") - .replace("\"%JAVA_EXE%\" %DEFAULT_JVM_OPTS%", "start \"jadx-gui\" /B \"%JAVA_EXE%\" %DEFAULT_JVM_OPTS%") + val newContent = + windowsScript.readText() + .replace("java.exe", "javaw.exe") + .replace("\"%JAVA_EXE%\" %DEFAULT_JVM_OPTS%", "start \"jadx-gui\" /B \"%JAVA_EXE%\" %DEFAULT_JVM_OPTS%") windowsScript.writeText(newContent) } } diff --git a/jadx-plugins/jadx-java-convert/build.gradle.kts b/jadx-plugins/jadx-java-convert/build.gradle.kts index 955b0bca8..114c1297b 100644 --- a/jadx-plugins/jadx-java-convert/build.gradle.kts +++ b/jadx-plugins/jadx-java-convert/build.gradle.kts @@ -9,5 +9,5 @@ dependencies { implementation("com.jakewharton.android.repackaged:dalvik-dx:11.0.0_r3") implementation("com.android.tools:r8:8.1.56") - implementation("org.ow2.asm:asm:9.5") + implementation("org.ow2.asm:asm:9.6") }