removed Ant support

alexzaitsev · Nov 26, 2019 · 8b8c64e · 8b8c64e
1 parent 5e502cf
commit 8b8c64e
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 131 deletions.
diff --git a/build.gradle b/build.gradle
@@ -20,12 +20,7 @@ testlogger {
     slowThreshold 0           // show time
 }
 clean {
-	delete = [                   // delete anything excluding compiled jar
-		'build/classes',
-		'build/generated',
-		'build/tmp',
-		'build/test-results',
-		'build/reports']
+	delete = ['build']
 }
 dependencies {
 	implementation 'org.smali:baksmali:2.2.5'      // runtime dependency

diff --git a/build.xml b/build.xml
diff --git a/ivy.xml b/ivy.xml
diff --git a/release.sh b/release.sh
@@ -5,4 +5,4 @@ if [ $# -ne 1 ]; then
 fi
 gradle build
 echo "var dependencies = {links:[{\"source\":\"Class A\",\"dest\":\"Class B\"},{\"source\":\"Class C\",\"dest\":\"Class B\"},]};" > gui/analyzed.js
-zip -u -x .DS_Store -r "apk-dependency-graph-scripts-$1.zip" build/jar/apk-dependency-graph.jar gui/* filters/default.json filters/instructions.txt run.bat run.sh  
+zip -u -x .DS_Store -r "apk-dependency-graph-scripts-$1.zip" build/libs/apk-dependency-graph.jar gui/* filters/default.json filters/instructions.txt run.bat run.sh  
diff --git a/run.bat b/run.bat
@@ -24,4 +24,4 @@ For %%A in ("%filename%") do (
 Set outPath=%~dp0\output\%Name:~0,-4%
 Set jsonPath=%~dp0\gui\analyzed.js
 
-java -jar %~dp0\build\jar\apk-dependency-graph.jar -i %outPath% -o %jsonPath% -a %1 -f %2
+java -jar %~dp0\build\libs\apk-dependency-graph.jar -i %outPath% -o %jsonPath% -a %1 -f %2
diff --git a/run.sh b/run.sh
@@ -15,4 +15,4 @@ dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 outPath=${dir}"/output/"${xpref}
 jsonPath=${dir}"/gui/analyzed.js"
 
-eval "java -jar ${dir}'/build/jar/apk-dependency-graph.jar' -i ${outPath} -o ${jsonPath} -a $1 -f $2"
+eval "java -jar ${dir}'/build/libs/apk-dependency-graph.jar' -i ${outPath} -o ${jsonPath} -a $1 -f $2"
diff --git a/src/main/java/com/alex_zaitsev/adg/Main.java b/src/main/java/com/alex_zaitsev/adg/Main.java
@@ -50,7 +50,7 @@ public static void main(String[] args) {
         if (analyzer.run()) {
             File resultFile = new File(arguments.getResultPath());
             new Writer(resultFile).write(analyzer.getDependencies());
-            System.out.println("Success! Now open index.html in your browser.");
+            System.out.println("Success! Now open gui/index.html in your browser.");
         }
     }
 }