Merge pull request #332422 from emilytrau/jadx-fix

  gradle,

  jdk,

  quark-engine,

  makeWrapper,

  makeBinaryWrapper,

  imagemagick,

  makeDesktopItem,

  copyDesktopItems,

    hash = "sha256-+F+PHAd1+FmdAlQkjYDBsUYCUzKXG19ZUEorfvBUEg0=";

  };

  patches = [

    # Remove use of launch4j - contains platform binaries not able to be cached by mitmCache

    ./no-native-deps.diff

  ];

  nativeBuildInputs = [

    gradle

    jdk

    imagemagick

    makeWrapper

    makeBinaryWrapper

    copyDesktopItems

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];

  ];

  meta = with lib; {

    changelog = "https://github.com/skylot/jadx/releases/tag/v${finalAttrs.version}";

    description = "Dex to Java decompiler";

    homepage = "https://github.com/skylot/jadx";

    longDescription = ''

      Command line and GUI tools for produce Java source code from Android Dex

      and Apk files.

   "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=",

   "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU="

  },

  "com/thoughtworks/xstream#xstream-parent/1.4.20": {

   "pom": "sha256-ERiJ4wIWWg9EpU3k23BSUNHeDckbp4oZih0ieDRL7uc="

  },

  "com/thoughtworks/xstream#xstream/1.4.20": {

   "jar": "sha256-h98PC+V8kgN9ARD7siWjC2UXAtwnVlPSha/P7zG8LoE=",

   "pom": "sha256-c9gezjnpSh0tf80BhGYqo9QQa/6XCbeTlkiS4+f0/cQ="

  },

  "commons-codec#commons-codec/1.16.0": {

   "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=",

   "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ="

   "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=",

   "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8="

  },

  "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.5": {

   "pom": "sha256-Nplw/agsRFMGIjSqxiwBbqw5nY8C2VKdUe28QY0fzPs="

  },

  "edu/sc/seis/launch4j#launch4j/3.0.5": {

   "jar": "sha256-4x62k3vvPwCsxAPkraf7ihY4ATiQ0bNSVmiFBocx7WM=",

   "module": "sha256-+hiZBJpE2pdEnjoBvCx9rC01t0npPPdsBDSuzjT9ux8=",

   "pom": "sha256-UvTlC0T2dzuebNq7jmmveQc4IW+8ZxJ1G77tGKFCknk="

  },

  "io/fabric8#kubernetes-client-bom/5.12.2": {

   "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs="

  },

  "io/github/x-stream#mxparser/1.2.2": {

   "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=",

   "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg="

  },

  "io/netty#netty-bom/4.1.86.Final": {

   "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0="

  },

  "jakarta/platform#jakartaee-api-parent/9.0.0": {

   "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs="

  },

  "net/sf/launch4j#launch4j/3.50": {

   "pom": "sha256-1716EuPm1bR/Ou0p/4g89cTKnie3GWkQZnkzH6N+xy0="

  },

  "net/sf/launch4j#launch4j/3.50/core": {

   "jar": "sha256-2U8eT20fHhl9Es7vpwot75OMzxbig+mjx0Cmb/WGvW8="

  },

  "org/apache#apache/23": {

   "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="

  },

  },

  "se/patrikerdes/use-latest-versions#se.patrikerdes.use-latest-versions.gradle.plugin/0.2.18": {

   "pom": "sha256-6DCee4xZSPaNwK2dl7lOwIsfw5lm2eXsrsNOzFbMnnI="

  },

  "xmlpull#xmlpull/1.1.3.1": {

   "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=",

   "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs="

  }

 },

 "https://repo.maven.apache.org/maven2": {

  "net/java#jvnet-parent/3": {

   "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="

  },

  "net/sf/launch4j#launch4j/3.50": {

   "pom": "sha256-1716EuPm1bR/Ou0p/4g89cTKnie3GWkQZnkzH6N+xy0="

  },

  "net/sf/launch4j#launch4j/3.50/workdir-mac": {

   "jar": "sha256-ciYD+rZJnfaTUvdmC5+Y8MSF6aREBAD/f6PWJ/kXOyQ="

  },

  "net/sf/saxon#Saxon-HE/10.6": {

   "jar": "sha256-bQjfguTthrarsaAse3SiaPz8XgBOg7tP8AbsOlCb01Y=",

   "pom": "sha256-otbdpDjoZKuTXzG0O1MFLE6HEalQVkJxkZBRPnb0Ekg="

diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts

index 09f2c05f..bdb641b0 100644

--- a/jadx-gui/build.gradle.kts

+++ b/jadx-gui/build.gradle.kts

@@ -1,7 +1,6 @@

 plugins {

 	id("jadx-kotlin")

 	id("application")

-	id("edu.sc.seis.launch4j") version "3.0.5"

 	id("com.github.johnrengelman.shadow") version "8.1.1"

 	id("org.beryx.runtime") version "1.13.1"

 }

@@ -101,24 +100,6 @@

 	}

 }

-launch4j {

-	mainClassName.set(application.mainClass.get())

-	copyConfigurable.set(listOf<Any>())

-	setJarTask(tasks.shadowJar.get())

-	icon.set("$projectDir/src/main/resources/logos/jadx-logo.ico")

-	outfile.set("jadx-gui-$jadxVersion.exe")

-	copyright.set("Skylot")

-	windowTitle.set("jadx")

-	companyName.set("jadx")

-	jreMinVersion.set("11")

-	jvmOptions.set(application.applicationDefaultJvmArgs.toSet())

-	requires64Bit.set(true)

-	initialHeapPercent.set(5)

-	maxHeapSize.set(4096)

-	maxHeapPercent.set(70)

-	downloadUrl.set("https://www.oracle.com/java/technologies/downloads/#jdk17-windows")

-	bundledJrePath.set(if (project.hasProperty("bundleJRE")) "%EXEDIR%/jre" else "%JAVA_HOME%")

-}

 runtime {

 	addOptions("--strip-debug", "--compress", "2", "--no-header-files", "--no-man-pages")

@@ -137,30 +118,6 @@

 	}

 }

-val copyDistWinWithJre by tasks.registering(Copy::class) {

-	group = "jadx"

-	dependsOn(tasks.named("runtime"), tasks.named("createExe"))

-	from(runtime.jreDir) {

-		include("**/*")

-		into("jre")

-	}

-	from(tasks.named("createExe").get().outputs) {

-		include("*.exe")

-	}

-	into(layout.buildDirectory.dir("jadx-gui-$jadxVersion-with-jre-win"))

-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE

-}

-

-val distWinWithJre by tasks.registering(Zip::class) {

-	group = "jadx"

-	dependsOn(copyDistWinWithJre)

-	archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip")

-	from(copyDistWinWithJre.get().outputs) {

-		include("**/*")

-	}

-	into(layout.buildDirectory.asFile)

-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE

-}

 val addNewNLSLines by tasks.registering(JavaExec::class) {

 	group = "jadx"