Magic-Mirror/jadx
1
0
Fork 0
mirror of https://github.com/skylot/jadx.git synced 2024-10-07 01:53:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: update gradle and dependencies

Browse Source
This commit is contained in:
Skylot 2023-10-07 18:07:56 +01:00
parent d120556772
commit 6433fcef72
No known key found for this signature in database
GPG Key ID: 47866607B16F25C8
7 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -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" }

2
buildSrc/src/main/kotlin/jadx-java.gradle.kts
View File

@ -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")

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -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

12
jadx-cli/build.gradle.kts
View File

@ -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")

4
jadx-core/build.gradle.kts
View File

@ -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")

33
jadx-gui/build.gradle.kts
View File

@ -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)
}
}

2
jadx-plugins/jadx-java-convert/build.gradle.kts
View File

@ -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")
}