Merge pull request #615 from soot-oss/fix/dex2jardependency

fix dex2jar dependency
soot-oss · Jun 1, 2023 · 8ac5289 · 8ac5289
2 parents df30acf + 2b16a5a
commit 8ac5289
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -196,32 +196,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>3.0.0</version>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>install-dex2jar</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <executable>mvn</executable>
-                    <arguments>
-                        <argument>install:install-file</argument>
-                        <argument>-Dfile=sootup.java.bytecode/lib/dex-tools-2.2-SNAPSHOT.jar</argument>
-                        <argument>-DgroupId=com.googlecode.d2j</argument>
-                        <argument>-DartifactId=dex-tools</argument>
-                        <argument>-Dversion=2.2-SNAPSHOT</argument>
-                        <argument>-Dpackaging=jar</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>com.coveo</groupId>
                 <artifactId>fmt-maven-plugin</artifactId>

diff --git a/sootup.java.bytecode/pom.xml b/sootup.java.bytecode/pom.xml
@@ -34,12 +34,26 @@
 			<version>9.5</version>
 		</dependency>
 		<dependency>
-			<groupId>com.googlecode.d2j</groupId>
+			<groupId>com.github.ThexXTURBOXx.dex2jar</groupId>
 			<artifactId>dex-tools</artifactId>
-			<version>2.2-SNAPSHOT</version>
+			<version>v63</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.ThexXTURBOXx.dex2jar</groupId>
+			<artifactId>d2j-base-cmd</artifactId>
+			<version>v63</version>
 		</dependency>
 	</dependencies>
 
-
+	<repositories>
+		<repository>
+			<id>jitpack.io</id>
+			<url>https://jitpack.io</url>
+		</repository>
+		<repository>
+			<id>maven.google</id>
+			<url>https://maven.google.com/</url>
+		</repository>
+	</repositories>
 
 </project>
diff --git a/...code/src/main/java/sootup/java/bytecode/inputlocation/PathBasedAnalysisInputLocation.java b/...code/src/main/java/sootup/java/bytecode/inputlocation/PathBasedAnalysisInputLocation.java
@@ -541,7 +541,7 @@ private String dex2jar(Path path) {
       int start = apkPath.lastIndexOf(File.separator);
       int end = apkPath.lastIndexOf(".apk");
       String outputFile = outDir + apkPath.substring(start + 1, end) + ".jar";
-      new Dex2jarCmd().doMain("-f", apkPath, "-o", outputFile);
+      Dex2jarCmd.main("-f", apkPath, "-o", outputFile);
       return outputFile;
     }
   }