Dependency housekeeping + use apktool from maven central

Churro · Dec 28, 2021 · bee3b6b · bee3b6b
1 parent 6fb02a4
commit bee3b6b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 87 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,25 +1,4 @@
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
+.idea
 
 target
 .settings

diff --git a/lib/apktool/apktool/2.5.0/apktool-2.5.0.jar b/lib/apktool/apktool/2.5.0/apktool-2.5.0.jar
diff --git a/lib/apktool/apktool/2.5.0/apktool-2.5.0.pom b/lib/apktool/apktool/2.5.0/apktool-2.5.0.pom
diff --git a/lib/apktool/apktool/maven-metadata-local.xml b/lib/apktool/apktool/maven-metadata-local.xml
diff --git a/lib/install.txt b/lib/install.txt
diff --git a/pom.xml b/pom.xml
@@ -12,15 +12,16 @@
     <java.version>1.8</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <commons-io.version>2.7</commons-io.version>
-    <guava.version>30.1.1-jre</guava.version>
-    <httpcore.version>4.4.14</httpcore.version>
+    <commons-io.version>2.11.0</commons-io.version>
+    <guava.version>31.0.1-jre</guava.version>
+    <httpcore.version>4.4.15</httpcore.version>
     <ST4.version>4.3.1</ST4.version>
     <largetext.version>0.2.0</largetext.version>
+    <apktool.version>2.6.0</apktool.version>
 
     <!-- Logging -->
-    <logback.version>1.2.3</logback.version>
-    <slf4j.version>1.7.30</slf4j.version>
+    <logback.version>1.2.10</logback.version>
+    <slf4j.version>1.7.32</slf4j.version>
 
     <!-- Maven plugins -->
     <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
@@ -73,9 +74,9 @@
       <version>${largetext.version}</version>
     </dependency>
     <dependency>
-      <groupId>apktool</groupId>
-      <artifactId>apktool</artifactId>
-      <version>2.5.0</version>
+      <groupId>org.apktool</groupId>
+      <artifactId>apktool-lib</artifactId>
+      <version>${apktool.version}</version>
     </dependency>
   </dependencies>
 
@@ -92,27 +93,6 @@
         </configuration>
       </plugin>
 
-      <!--<plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <version>2.5.2</version>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <configuration>
-              <file>${basedir}/lib/apktool_2.5.0.jar</file>
-              <groupId>apktool</groupId>
-              <artifactId>apktool</artifactId>
-              <version>2.5.0</version>
-              <packaging>jar</packaging>
-            </configuration>
-            <goals>
-              <goal>install-file</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>-->
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>

diff --git a/src/main/java/at/tugraz/iaik/cryptoslice/analysis/preprocessing/DecompileApkStep.java b/src/main/java/at/tugraz/iaik/cryptoslice/analysis/preprocessing/DecompileApkStep.java
@@ -59,7 +59,7 @@ private void decode(File apk, File destination, String frameworkDir) throws Anal
         decoder.setOutDir(destination);
         decoder.setApkFile(apk);
         decoder.setFrameworkDir(frameworkDir);
-        decoder.setAnalysisMode(true, false); // decode resources with original API level
+        decoder.setAnalysisMode(true); // decode resources with original API level
 
         /*if (XMLTPatternSource.getInstance().isForwardPatternProvided())
           decoder.setDecodeResources((short) 0x0101); // DECODE_RESOURCES_FULL, default value of Apktool