Merge remote-tracking branch 'origin/GP-5220b_Dan_updateDex2JarAndAsm--SQUASHED'

Author: ryanmkurtz

Ghidra/Features/FileFormats/Module.manifest

@@ -1,8 +1,12 @@
-MODULE FILE LICENSE: lib/dex-ir-2.1.jar Apache License 2.0
-MODULE FILE LICENSE: lib/dex-reader-2.1.jar Apache License 2.0
-MODULE FILE LICENSE: lib/dex-reader-api-2.1.jar Apache License 2.0
-MODULE FILE LICENSE: lib/dex-translator-2.1.jar Apache License 2.0
-MODULE FILE LICENSE: lib/asm-debug-all-5.0.3.jar INRIA License
+MODULE FILE LICENSE: lib/dex-ir-2.4.24.jar Apache License 2.0
+MODULE FILE LICENSE: lib/dex-reader-2.4.24.jar Apache License 2.0
+MODULE FILE LICENSE: lib/dex-reader-api-2.4.24.jar Apache License 2.0
+MODULE FILE LICENSE: lib/dex-translator-2.4.24.jar Apache License 2.0
+MODULE FILE LICENSE: lib/asm-9.7.1.jar INRIA License
+MODULE FILE LICENSE: lib/asm-analysis-9.7.1.jar INRIA License
+MODULE FILE LICENSE: lib/asm-commons-9.7.1.jar INRIA License
+MODULE FILE LICENSE: lib/asm-tree-9.7.1.jar INRIA License
+MODULE FILE LICENSE: lib/asm-util-9.7.1.jar INRIA License
 MODULE FILE LICENSE: lib/baksmali-2.5.2.jar BSD-3-GRUVER
 MODULE FILE LICENSE: lib/dexlib2-2.5.2.jar BSD-3-GRUVER
 MODULE FILE LICENSE: lib/util-2.5.2.jar BSD-3-GRUVER

Ghidra/Features/FileFormats/build.gradle

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,11 +31,15 @@ dependencies {
 	api project(':PDB')
 
 	// Used by "Android DEX to JAR" file system
-	api ':dex-ir:2.1'
-	api ':dex-reader:2.1'
-	api ':dex-reader-api:2.1'
-	api ':dex-translator:2.1'
-	api 'org.ow2.asm:asm-debug-all:5.0.3'
+	api 'de.femtopedia.dex2jar:dex-ir:2.4.24'
+	api 'de.femtopedia.dex2jar:dex-reader:2.4.24'
+	api 'de.femtopedia.dex2jar:dex-reader-api:2.4.24'
+	api 'de.femtopedia.dex2jar:dex-translator:2.4.24'
+	api 'org.ow2.asm:asm:9.7.1'
+	api 'org.ow2.asm:asm-analysis:9.7.1'
+	api 'org.ow2.asm:asm-commons:9.7.1'
+	api 'org.ow2.asm:asm-tree:9.7.1'
+	api 'org.ow2.asm:asm-util:9.7.1'
 
 	// Used by "Android DEX to SMALI" file system
 	api 'org.smali:baksmali:2.5.2' // requires guava-27.1-android or later

gradle/support/fetchDependencies.gradle

@@ -61,15 +61,6 @@ file("${REPO_DIR}/Ghidra/application.properties").withReader { reader ->
 }
 
 ext.deps = [
-	[
-		name: "dex2jar-2.1.zip",
-		url: "https://github.com/pxb1988/dex2jar/releases/download/v2.1/dex2jar-2.1.zip",
-		sha256: "7a9bdf843d43de4d1e94ec2e7b6f55825017b0c4a7ee39ff82660e2493a46f08",
-		destination: {
-			unzip(DOWNLOADS_DIR, DOWNLOADS_DIR, "dex2jar-2.1.zip")
-			copyDirectory(new File(DOWNLOADS_DIR, "dex-tools-2.1/lib/"), FLAT_REPO_DIR, new WildcardFileFilter("dex-*"));
-		}
-	],
 	[
 		name: "java-sarif-2.1-modified.jar",
 		url: "https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${RELEASE_VERSION}/lib/java-sarif-2.1-modified.jar",