Skip to content

Commit 462e582

Browse files
committed
chore: update gradle and dependencies
1 parent 14a7b63 commit 462e582

34 files changed

Lines changed: 169 additions & 185 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ For Windows, you can download it from [oracle.com](https://www.oracle.com/java/t
7272
You can use jadx in your java projects, check details on [wiki page](https://github.com/skylot/jadx/wiki/Use-jadx-as-a-library)
7373

7474
### Build from source
75-
JDK 11 or higher must be installed:
75+
JDK 17 or higher must be installed:
7676
```
7777
git clone https://github.com/skylot/jadx.git
7878
cd jadx

build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import java.util.Locale
88
plugins {
99
id("com.github.ben-manes.versions") version "0.53.0"
1010
id("se.patrikerdes.use-latest-versions") version "0.2.19"
11-
id("com.diffplug.spotless") version "6.25.0"
11+
id("com.diffplug.spotless") version "8.4.0"
1212
}
1313

1414
val jadxVersion by extra { System.getenv("JADX_VERSION") ?: "dev" }
@@ -98,7 +98,9 @@ val copyArtifacts by tasks.registering(Copy::class) {
9898
from(tasks.getByPath(":jadx-cli:installShadowDist")) {
9999
exclude("**/*.jar")
100100
filter { line ->
101-
jarCliPattern.matcher(line).replaceAll("jadx-$1-all.jar")
101+
jarCliPattern
102+
.matcher(line)
103+
.replaceAll("jadx-$1-all.jar")
102104
.replace("-jar \"\\\"\$CLASSPATH\\\"\"", "-cp \"\\\"\$CLASSPATH\\\"\" jadx.cli.JadxCLI")
103105
.replace("-jar \"%CLASSPATH%\"", "-cp \"%CLASSPATH%\" jadx.cli.JadxCLI")
104106
}

buildSrc/src/main/kotlin/jadx-java.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ version = jadxVersion
1515

1616
dependencies {
1717
implementation("org.slf4j:slf4j-api:2.0.17")
18-
compileOnly("org.jetbrains:annotations:26.0.2")
18+
compileOnly("org.jetbrains:annotations:26.1.0")
1919

20-
testImplementation("ch.qos.logback:logback-classic:1.5.22")
21-
testImplementation("org.assertj:assertj-core:3.27.6")
20+
testImplementation("ch.qos.logback:logback-classic:1.5.32")
21+
testImplementation("org.assertj:assertj-core:3.27.7")
2222

2323
testImplementation("org.junit.jupiter:junit-jupiter:5.13.3")
2424
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
2525

26-
testCompileOnly("org.jetbrains:annotations:26.0.2")
26+
testCompileOnly("org.jetbrains:annotations:26.1.0")
2727
}
2828

2929
repositories {

buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ repositories {
77
}
88

99
dependencies {
10-
rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.24.0")
11-
rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.20.0")
12-
rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.24.0")
13-
rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.24.0")
10+
rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.30.0")
11+
rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.26.0")
12+
rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.30.1")
13+
rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.30.1")
1414
}
1515

1616
tasks {

gradle/wrapper/gradle-wrapper.jar

3.25 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
3+
distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jadx-cli/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
runtimeOnly(project(":jadx-plugins:jadx-apks-input"))
2626

2727
implementation("org.jcommander:jcommander:2.0")
28-
implementation("ch.qos.logback:logback-classic:1.5.22")
28+
implementation("ch.qos.logback:logback-classic:1.5.32")
2929
implementation("com.google.code.gson:gson:2.13.2")
3030
}
3131

jadx-core/build.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,18 @@ dependencies {
2424
strictly("[3.33, 3.34[") // from 3.34 compiled with Java 17
2525
}
2626
}
27-
testImplementation("tools.profiler:async-profiler:4.2")
27+
testImplementation("tools.profiler:async-profiler:4.3")
2828
}
2929

3030
val jadxTestJavaVersion = getTestJavaVersion()
3131

3232
fun getTestJavaVersion(): Int? {
3333
val envVarName = "JADX_TEST_JAVA_VERSION"
3434
val testJavaVer = System.getenv(envVarName)?.toInt() ?: return null
35-
val currentJavaVer = java.toolchain.languageVersion.get().asInt()
35+
val currentJavaVer =
36+
java.toolchain.languageVersion
37+
.get()
38+
.asInt()
3639
if (testJavaVer < currentJavaVer) {
3740
throw GradleException("'$envVarName' can't be set to lower version than $currentJavaVer")
3841
}

jadx-gui/build.gradle.kts

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,13 @@ dependencies {
5555
implementation("com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0")
5656
implementation("com.eclipsesource.j2v8:j2v8_win32_x86_64:4.6.0")
5757

58-
testImplementation(project.project(":jadx-core").sourceSets.getByName("test").output)
58+
testImplementation(
59+
project
60+
.project(":jadx-core")
61+
.sourceSets
62+
.getByName("test")
63+
.output,
64+
)
5965
}
6066

6167
val jadxVersion: String by rootProject.extra
@@ -119,12 +125,14 @@ project.components.withType(AdhocComponentWithVariants::class.java).forEach { c
119125
tasks.startShadowScripts {
120126
doLast {
121127
val newWindowsScriptContent =
122-
windowsScript.readText()
128+
windowsScript
129+
.readText()
123130
.replace("java.exe", "javaw.exe")
124131
.replace("\"%JAVA_EXE%\" %DEFAULT_JVM_OPTS%", "start \"jadx-gui\" /B \"%JAVA_EXE%\" %DEFAULT_JVM_OPTS%")
125132
// Add launch script path as a property
126133
val newUnixScriptContent =
127-
unixScript.readText()
134+
unixScript
135+
.readText()
128136
.replace(
129137
Regex("DEFAULT_JVM_OPTS=.+", RegexOption.MULTILINE),
130138
{ result -> result.value + "\" \\\"-Djadx.launchScript.path=\$(realpath $0)\\\"\"" },
@@ -151,18 +159,24 @@ launch4j {
151159
supportUrl.set("https://github.com/skylot/jadx")
152160

153161
bundledJrePath.set(if (project.hasProperty("bundleJRE")) "%EXEDIR%/jre" else "%JAVA_HOME%")
154-
classpath.set(tasks.getByName("shadowJar").outputs.files.map { "%EXEDIR%/lib/${it.name}" }.sorted().toList())
162+
classpath.set(
163+
tasks
164+
.getByName("shadowJar")
165+
.outputs.files
166+
.map { "%EXEDIR%/lib/${it.name}" }
167+
.sorted()
168+
.toList(),
169+
)
155170
println("Launch4J classpath: ${classpath.get()}")
156171

157172
chdir.set("") // don't change current dir
158173
libraryDir.set("") // don't add any libs
159174
}
160175

161-
fun escapeJVMOptions(): List<String> {
162-
return application.applicationDefaultJvmArgs
176+
fun escapeJVMOptions(): List<String> =
177+
application.applicationDefaultJvmArgs
163178
.toList()
164179
.map { if (it.startsWith("-D")) "\"$it\"" else it }
165-
}
166180

167181
runtime {
168182
addOptions("--strip-debug", "--no-header-files", "--no-man-pages")

0 commit comments

Comments
 (0)