tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/build.gradle.kts b/build.gradle.kts
2index 7e4d28a9..0fe94ff6 100644
3--- a/build.gradle.kts
4+++ b/build.gradle.kts
5@@ -115,46 +115,11 @@ fun isNonStable(version: String): Boolean {
6 destinationDirectory.set(layout.buildDirectory)
7 }
8
9-val distWin by tasks.registering(Zip::class) {
10- group = "jadx"
11- description = "Build Windows bundle"
12-
13- val guiTask = tasks.getByPath("jadx-gui:copyDistWin")
14- dependsOn(guiTask)
15- from(guiTask.outputs)
16-
17- destinationDirectory.set(layout.buildDirectory.dir("distWin"))
18- archiveFileName.set("jadx-gui-$jadxVersion-win.zip")
19- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
20-}
21-
22-val distWinWithJre by tasks.registering(Zip::class) {
23- description = "Build Windows with JRE bundle"
24-
25- val guiTask = tasks.getByPath(":jadx-gui:copyDistWinWithJre")
26- dependsOn(guiTask)
27- from(guiTask.outputs)
28-
29- destinationDirectory.set(layout.buildDirectory.dir("distWinWithJre"))
30- archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip")
31- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
32-}
33-
34 val dist by tasks.registering {
35 group = "jadx"
36 description = "Build jadx distribution zip bundles"
37
38 dependsOn(pack)
39-
40- val os = DefaultNativePlatform.getCurrentOperatingSystem()
41- if (os.isWindows) {
42- if (project.hasProperty("bundleJRE")) {
43- println("Build win bundle with JRE")
44- dependsOn(distWinWithJre)
45- } else {
46- dependsOn(distWin)
47- }
48- }
49 }
50
51 val cleanBuildDir by tasks.registering(Delete::class) {
52diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
53index ff9e7e36..7a63af40 100644
54--- a/buildSrc/build.gradle.kts
55+++ b/buildSrc/build.gradle.kts
56@@ -4,8 +4,6 @@
57
58 dependencies {
59 implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0")
60-
61- implementation("org.openrewrite:plugin:6.19.1")
62 }
63
64 repositories {
65diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
66index ad65de18..ecb53db1 100644
67--- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts
68+++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
69@@ -3,8 +3,6 @@
70 plugins {
71 java
72 checkstyle
73-
74- id("jadx-rewrite")
75 }
76
77 val jadxVersion: String by rootProject.extra
78diff --git a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts b/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
79deleted file mode 100644
80index aab46d55..00000000
81--- a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
82+++ /dev/null
83@@ -1,35 +0,0 @@
84-plugins {
85- id("org.openrewrite.rewrite")
86-}
87-
88-repositories {
89- mavenCentral()
90-}
91-
92-dependencies {
93- rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.13.0")
94- rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.11.0")
95- rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.13.0")
96- rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.12.0")
97-}
98-
99-tasks {
100- rewrite {
101- // exclusion("src/test/java/jadx/tests/integration")
102-
103- // activeRecipe("org.openrewrite.java.migrate.Java8toJava11")
104-
105- // checkstyle auto fix
106- // activeRecipe("org.openrewrite.staticanalysis.CodeCleanup")
107- // setCheckstyleConfigFile(file("$rootDir/config/checkstyle/checkstyle.xml"))
108-
109- // logging
110- // activeRecipe("org.openrewrite.java.logging.slf4j.Slf4jBestPractices")
111- // activeRecipe("org.openrewrite.java.logging.slf4j.LoggersNamedForEnclosingClass")
112- // activeRecipe("org.openrewrite.java.logging.slf4j.ParameterizedLogging")
113- // activeRecipe("org.openrewrite.java.logging.PrintStackTraceToLogError")
114-
115- // testing
116- activeRecipe("org.openrewrite.java.testing.assertj.Assertj")
117- }
118-}
119diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts
120index b9d64ae7..4c1c23f8 100644
121--- a/jadx-gui/build.gradle.kts
122+++ b/jadx-gui/build.gradle.kts
123@@ -2,7 +2,6 @@
124 id("jadx-kotlin")
125 id("application")
126 id("jadx-library")
127- id("edu.sc.seis.launch4j") version "3.0.6"
128 id("com.gradleup.shadow") version "8.3.8"
129 id("org.beryx.runtime") version "1.13.1"
130 }
131@@ -136,36 +135,6 @@
132 }
133 }
134
135-launch4j {
136- mainClassName.set(application.mainClass.get())
137- copyConfigurable.set(listOf<Any>())
138- dontWrapJar.set(true)
139- icon.set("$projectDir/src/main/resources/logos/jadx-logo.ico")
140- outfile.set("jadx-gui-$jadxVersion.exe")
141- version.set(jadxVersion)
142- copyright.set("Skylot")
143- windowTitle.set("jadx")
144- companyName.set("jadx")
145- jreMinVersion.set("11")
146- jvmOptions.set(escapeJVMOptions())
147- requires64Bit.set(true)
148- downloadUrl.set("https://www.oracle.com/java/technologies/downloads/#jdk21-windows")
149- supportUrl.set("https://github.com/skylot/jadx")
150-
151- bundledJrePath.set(if (project.hasProperty("bundleJRE")) "%EXEDIR%/jre" else "%JAVA_HOME%")
152- classpath.set(tasks.getByName("shadowJar").outputs.files.map { "%EXEDIR%/lib/${it.name}" }.sorted().toList())
153- println("Launch4J classpath: ${classpath.get()}")
154-
155- chdir.set("") // don't change current dir
156- libraryDir.set("") // don't add any libs
157-}
158-
159-fun escapeJVMOptions(): List<String> {
160- return application.applicationDefaultJvmArgs
161- .toList()
162- .map { if (it.startsWith("-D")) "\"$it\"" else it }
163-}
164-
165 runtime {
166 addOptions("--strip-debug", "--compress", "zip-9", "--no-header-files", "--no-man-pages")
167 addModules(
168@@ -186,48 +155,6 @@ fun escapeJVMOptions(): List<String> {
169 }
170 }
171
172-val copyDistWin by tasks.registering(Copy::class) {
173- description = "Copy files for Windows bundle"
174-
175- val libTask = tasks.getByName("shadowJar")
176- dependsOn(libTask)
177- from(libTask.outputs) {
178- include("*.jar")
179- into("lib")
180- }
181- val exeTask = tasks.getByName("createExe")
182- dependsOn(exeTask)
183- from(exeTask.outputs) {
184- include("*.exe")
185- }
186- into(layout.buildDirectory.dir("jadx-gui-win"))
187- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
188-}
189-
190-val copyDistWinWithJre by tasks.registering(Copy::class) {
191- description = "Copy files for Windows with JRE bundle"
192-
193- val jreTask = tasks.runtime.get()
194- dependsOn(jreTask)
195- from(jreTask.jreDir) {
196- include("**/*")
197- into("jre")
198- }
199- val libTask = tasks.getByName("shadowJar")
200- dependsOn(libTask)
201- from(libTask.outputs) {
202- include("*.jar")
203- into("lib")
204- }
205- val exeTask = tasks.getByName("createExe")
206- dependsOn(exeTask)
207- from(exeTask.outputs) {
208- include("*.exe")
209- }
210- into(layout.buildDirectory.dir("jadx-gui-with-jre-win"))
211- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
212-}
213-
214 val syncNLSLines by tasks.registering(JavaExec::class) {
215 group = "jadx-dev"
216 description = "Utility task to sync new/missing translation using EN as a reference"