nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-23 17:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Backport release-26.05] jadx: 1.5.5 -> 1.5.6 (#544672)

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-07-23 00:09:46 +00:00
committed by GitHub
parent b863aaf4f5 4a11796a0b
commit 259fd14dee
3 changed files with 399 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

721
pkgs/by-name/ja/jadx/deps.json generated
View File

File diff suppressed because it is too large Load Diff

285
pkgs/by-name/ja/jadx/nix-build.patch
View File

@@ -1,79 +1,143 @@
diff --git a/build.gradle.kts b/build.gradle.kts
index df96f46c..f1f422f2 100644
index 0f4d3f09..a44eec6f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -126,42 +126,11 @@ fun isNonStable(version: String): Boolean {
destinationDirectory.set(layout.buildDirectory)
@@ -129,19 +129,6 @@ fun loadEnv(file: File): Map<String, String> {
return envMap
}
-val distWin by tasks.registering(Zip::class) {
- group = "jadx"
- description = "Build Windows bundle"
-
- from(distWinConfiguration)
-
- destinationDirectory.set(layout.buildDirectory.dir("distWin"))
- archiveFileName.set("jadx-gui-$jadxVersion-win.zip")
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-val distWinWithJre by tasks.registering(Zip::class) {
- description = "Build Windows with JRE bundle"
-
- from(distWinWithJreConfiguration)
-
- destinationDirectory.set(layout.buildDirectory.dir("distWinWithJre"))
- archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip")
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
val dist by tasks.registering {
group = "jadx"
description = "Build jadx distribution zip bundles"
dependsOn(pack)
-
- val os = DefaultNativePlatform.getCurrentOperatingSystem()
- if (os.isWindows) {
- if (project.hasProperty("bundleJRE")) {
- println("Build win bundle with JRE")
- dependsOn(distWinWithJre)
- } else {
- dependsOn(distWin)
- }
-val distWinConfiguration =
- configurations.create("distWinConfiguration") {
- isCanBeConsumed = false
- }
}
-val distWinWithJreConfiguration =
- configurations.create("distWinWithJreConfiguration") {
- isCanBeConsumed = false
- }
-dependencies {
- distWinConfiguration(project(":jadx-gui", "distWinConfiguration"))
- distWinWithJreConfiguration(project(":jadx-gui", "distWinWithJreConfiguration"))
-}
-
val copyArtifacts =
tasks.register<Copy>("copyArtifacts") {
val jarCliPattern = "jadx-cli-(.*)-all.jar".toPattern()
@@ -186,45 +173,12 @@ fun loadEnv(file: File): Map<String, String> {
}
}
val cleanBuildDir by tasks.registering(Delete::class) {
-val distWin =
- tasks.register<Zip>("distWin") {
- group = "jadx"
- description = "Build Windows bundle"
-
- from(distWinConfiguration)
-
- destinationDirectory.set(layout.buildDirectory.dir("distWin"))
- archiveFileName.set("jadx-gui-$jadxVersion-win.zip")
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
- }
-
-val distWinWithJre =
- tasks.register<Zip>("distWinWithJre") {
- description = "Build Windows with JRE bundle"
-
- from(distWinWithJreConfiguration)
-
- destinationDirectory.set(layout.buildDirectory.dir("distWinWithJre"))
- archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip")
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
- }
-
val dist =
tasks.register("dist") {
group = "jadx"
description = "Build jadx distribution zip bundles"
dependsOn(pack)
-
- val os = DefaultNativePlatform.getCurrentOperatingSystem()
- if (os.isWindows) {
- if (project.hasProperty("bundleJRE")) {
- println("Build win bundle with JRE")
- dependsOn(distWinWithJre)
- } else {
- dependsOn(distWin)
- }
- }
}
val cleanBuildDir =
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index ed67e57a..99aa9eb4 100644
index 15f610b4..99aa9eb4 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -4,8 +4,6 @@
@@ -4,10 +4,6 @@
dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10")
-
- implementation("org.openrewrite:plugin:6.19.1")
- implementation("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.2.0")
- implementation("net.ltgt.nullaway:net.ltgt.nullaway.gradle.plugin:2.3.0")
}
repositories {
diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
index 0f60d301..5e577155 100644
index 256dadde..7e044113 100644
--- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts
+++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
@@ -3,8 +3,6 @@
@@ -1,15 +1,8 @@
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import net.ltgt.gradle.errorprone.CheckSeverity
-import net.ltgt.gradle.errorprone.errorprone
-import net.ltgt.gradle.nullaway.nullaway
plugins {
java
checkstyle
-
- id("jadx-rewrite")
- id("net.ltgt.errorprone")
- id("net.ltgt.nullaway")
}
val jadxVersion: String by rootProject.extra
val jadxVersion = rootProject.extra["jadxVersion"] as String
@@ -30,9 +23,6 @@
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testCompileOnly("org.jetbrains:annotations:26.1.0")
-
- errorprone("com.google.errorprone:error_prone_core:2.50.0")
- errorprone("com.uber.nullaway:nullaway:0.13.7")
}
repositories {
@@ -77,21 +67,4 @@
if (checkEnabled) {
options.compilerArgs.add("-XDaddTypeAnnotationsToSymbol=true")
}
- options.errorprone {
- isEnabled = checkEnabled
- allErrorsAsWarnings = jadxBuildChecksMode == "warn"
- excludedPaths = ".*/test/.*"
- nullaway {
- if (jadxBuildChecksMode == "error") {
- error()
- }
- annotatedPackages.add("jadx")
- }
- // TODO: fix and enable all checks
- disable("MixedMutabilityReturnType")
- disable("EqualsGetClass")
- disable("OperatorPrecedence")
- disable("UnusedVariable")
- disable("ImmutableEnumChecker")
- }
}
diff --git a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts b/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
deleted file mode 100644
index ceca3fe5..00000000
index c6f3e979..00000000
--- a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
+++ /dev/null
@@ -1,35 +0,0 @@
@@ -86,10 +150,10 @@ index ceca3fe5..00000000
-}
-
-dependencies {
- rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.24.0")
- rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.20.0")
- rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.24.0")
- rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.24.0")
- rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.41.0")
- rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.29.2")
- rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.39.0")
- rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.38.0")
-}
-
-tasks {
@@ -113,7 +177,7 @@ index ceca3fe5..00000000
- }
-}
diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts
index 2677881f..4cec0884 100644
index fec42601..c4e20570 100644
--- a/jadx-gui/build.gradle.kts
+++ b/jadx-gui/build.gradle.kts
@@ -3,7 +3,6 @@
@@ -124,7 +188,7 @@ index 2677881f..4cec0884 100644
id("org.beryx.runtime") version "2.0.1"
}
@@ -129,36 +128,6 @@
@@ -142,42 +141,6 @@
}
}
@@ -145,79 +209,92 @@ index 2677881f..4cec0884 100644
- supportUrl.set("https://github.com/skylot/jadx")
-
- bundledJrePath.set(if (project.hasProperty("bundleJRE")) "%EXEDIR%/jre" else "%JAVA_HOME%")
- classpath.set(tasks.getByName("shadowJar").outputs.files.map { "%EXEDIR%/lib/${it.name}" }.sorted().toList())
- classpath.set(
- tasks
- .getByName("shadowJar")
- .outputs.files
- .map { "%EXEDIR%/lib/${it.name}" }
- .sorted()
- .toList(),
- )
- println("Launch4J classpath: ${classpath.get()}")
-
- chdir.set("") // don't change current dir
- libraryDir.set("") // don't add any libs
-}
-
-fun escapeJVMOptions(): List<String> {
- return application.applicationDefaultJvmArgs
-fun escapeJVMOptions(): List<String> =
- application.applicationDefaultJvmArgs
- .toList()
- .map { if (it.startsWith("-D")) "\"$it\"" else it }
-}
-
runtime {
addOptions("--strip-debug", "--compress", "zip-9", "--no-header-files", "--no-man-pages")
addOptions("--strip-debug", "--no-header-files", "--no-man-pages")
addModules(
@@ -179,48 +148,6 @@ fun escapeJVMOptions(): List<String> {
@@ -198,66 +161,6 @@ fun escapeJVMOptions(): List<String> =
}
}
-val copyDistWin by tasks.registering(Copy::class) {
- description = "Copy files for Windows bundle"
-val copyDistWin =
- tasks.register<Copy>("copyDistWin") {
- description = "Copy files for Windows bundle"
-
- val libTask = tasks.getByName("shadowJar")
- dependsOn(libTask)
- from(libTask.outputs) {
- include("*.jar")
- into("lib")
- val libTask = tasks.getByName("shadowJar")
- dependsOn(libTask)
- from(libTask.outputs) {
- include("*.jar")
- into("lib")
- }
- val exeTask = tasks.getByName("createExe")
- dependsOn(exeTask)
- from(exeTask.outputs) {
- include("*.exe")
- }
- into(layout.buildDirectory.dir("jadx-gui-win"))
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
- }
- val exeTask = tasks.getByName("createExe")
- dependsOn(exeTask)
- from(exeTask.outputs) {
- include("*.exe")
- }
- into(layout.buildDirectory.dir("jadx-gui-win"))
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-val copyDistWinWithJre by tasks.registering(Copy::class) {
- description = "Copy files for Windows with JRE bundle"
-val copyDistWinWithJre =
- tasks.register<Copy>("copyDistWinWithJre") {
- description = "Copy files for Windows with JRE bundle"
-
- val jreTask = tasks.runtime.get()
- dependsOn(jreTask)
- from(jreTask.jreDir) {
- include("**/*")
- into("jre")
- val jreTask = tasks.runtime.get()
- dependsOn(jreTask)
- from(jreTask.jreDir) {
- include("**/*")
- into("jre")
- }
- val libTask = tasks.getByName("shadowJar")
- dependsOn(libTask)
- from(libTask.outputs) {
- include("*.jar")
- into("lib")
- }
- val exeTask = tasks.getByName("createExe")
- dependsOn(exeTask)
- from(exeTask.outputs) {
- include("*.exe")
- }
- into(layout.buildDirectory.dir("jadx-gui-with-jre-win"))
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
- }
- val libTask = tasks.getByName("shadowJar")
- dependsOn(libTask)
- from(libTask.outputs) {
- include("*.jar")
- into("lib")
- }
- val exeTask = tasks.getByName("createExe")
- dependsOn(exeTask)
- from(exeTask.outputs) {
- include("*.exe")
- }
- into(layout.buildDirectory.dir("jadx-gui-with-jre-win"))
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
/**
* Register and expose distribution artifacts to use in top level packaging tasks
*/
@@ -230,10 +157,6 @@ fun escapeJVMOptions(): List<String> {
val distWinWithJreConfiguration by configurations.creating {
isCanBeResolved = false
}
-/**
- * Register and expose distribution artifacts to use in top level packaging tasks
- */
-val distWinConfiguration =
- configurations.create("distWinConfiguration") {
- isCanBeResolved = false
- }
-val distWinWithJreConfiguration =
- configurations.create("distWinWithJreConfiguration") {
- isCanBeResolved = false
- }
-artifacts {
- add(distWinConfiguration.name, copyDistWin)
- add(distWinWithJreConfiguration.name, copyDistWinWithJre)
-}
val syncNLSLines by tasks.registering(JavaExec::class) {
group = "jadx-dev"
-
val syncNLSLines =
tasks.register<JavaExec>("syncNLSLines") {
group = "jadx-dev"

4
pkgs/by-name/ja/jadx/package.nix
View File

@@ -17,13 +17,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "jadx";
version = "1.5.5";
version = "1.5.6";
src = fetchFromGitHub {
owner = "skylot";
repo = "jadx";
rev = "v${finalAttrs.version}";
hash = "sha256-WONsXDNhlDuqKsS2Olz3ndZIbi6mdi9JBKaHPpcdTQQ=";
hash = "sha256-qwGFMj18xJOrBudthAIeKc/PT0uUzjmTgBYovF4A/94=";
};
patches = [