From 8b8c64ee1dadd8d977080b920873df5ed62c2b9d Mon Sep 17 00:00:00 2001
From: Alex Zaitsev <madeinussr91@gmail.com>
Date: Tue, 26 Nov 2019 08:22:59 +0200
Subject: [PATCH] removed Ant support

---
 build.gradle                                 |   7 +-
 build.xml                                    | 107 -------------------
 ivy.xml                                      |  14 ---
 release.sh                                   |   2 +-
 run.bat                                      |   2 +-
 run.sh                                       |   2 +-
 src/main/java/com/alex_zaitsev/adg/Main.java |   2 +-
 7 files changed, 5 insertions(+), 131 deletions(-)
 delete mode 100644 build.xml
 delete mode 100644 ivy.xml

diff --git a/build.gradle b/build.gradle
index f640839..6b11e29 100644
--- 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
deleted file mode 100644
index 8734130..0000000
--- a/build.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<project xmlns:ivy="antlib:org.apache.ivy.ant"
-        name="apk-dependency-graph" basedir="." default="main">
-
-    <property name="src.dir"             value="src/main/java"/>
-    <property name="test.dir"            value="src/test/java"/>
-    <property name="build.dir"           value="build"/>
-    <property name="classes.dir"         value="${build.dir}/classes"/>
-    <property name="jar.dir"             value="${build.dir}/jar"/>
-    <property name="testclasses.dir"     value="${build.dir}/test-classes"/>
-    <property name="lib.dir"             value="lib" />
-    <property name="main-class"          value="com.alex_zaitsev.adg.Main"/>
-
-    <target name="clean">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="compile">
-        <mkdir dir="${classes.dir}"/>
-        <javac
-            srcdir="${src.dir}"
-            destdir="${classes.dir}"
-            classpathref="classpath.libraries"
-            includeantruntime="false" />
-    </target>
-
-    <target name="compileTest" depends="compile" description="Compile jUnit Test cases">
-        <mkdir dir="${testclasses.dir}"/>
-        <javac 
-            srcdir="${test.dir}" 
-            destdir="${testclasses.dir}" 
-            classpathref="classpath.test"
-            includeantruntime="false" />
-    </target>
-
-    <target name="test" depends="compileTest">
-        <junit printsummary="on" haltonfailure="yes" fork="true">
-            <classpath>
-                <path refid="classpath.test"/>
-                <pathelement location="${testclasses.dir}"/>
-            </classpath>
-            <formatter type="brief" usefile="false" />
-            <batchtest>
-                <fileset dir="${test.dir}" includes="**/*Test*.java" />
-            </batchtest>
-        </junit>
-    </target> 
-
-    <target name="jar" depends="test">
-        <mkdir dir="${jar.dir}"/>
-        <jar destfile="${jar.dir}/${ant.project.name}.jar" basedir="${classes.dir}">
-            <manifest>
-                <attribute name="Main-Class" value="${main-class}"/>
-            </manifest>
-            <zipgroupfileset dir="${basedir}/">
-                <include name="${lib.dir}/**/*.jar" />
-                <exclude name="${lib.dir}/**/*sources.jar"/>
-                <exclude name="${lib.dir}/**/*javadoc.jar"/>
-            </zipgroupfileset>
-        </jar>
-    </target>
-
-    <target name="clean-build" depends="clean,jar"/>
-
-    <target name="main" depends="clean,resolve,jar"/>
-
-    <!-- target: resolve -->
-    <property name="ivy.install.version" value="2.2.0" />
-    <condition property="ivy.home" value="${env.IVY_HOME}">
-      <isset property="env.IVY_HOME" />
-    </condition>
-    <property name="ivy.home" value="${basedir}/.ant" />
-    <property name="ivy.jar.dir" value="${ivy.home}/libs" />
-    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
-
-    <target name="download-ivy">
-        <mkdir dir="${ivy.jar.dir}"/>
-        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
-             dest="${ivy.jar.file}" usetimestamp="true"/>
-    </target>
-
-    <target name="init-ivy" depends="download-ivy">
-        <path id="ivy.lib.path">
-            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
-        </path>
-        <taskdef resource="org/apache/ivy/ant/antlib.xml"
-                 uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
-    </target>
-
-    <target name="resolve" description="--> retreive dependencies with ivy" depends="init-ivy">
-        <ivy:retrieve/>
-    </target>
-
-    <!-- path: external libraries classpath, we don't need sources and javadoc -->
-    <path id="classpath.libraries">
-        <fileset dir="${basedir}/">
-            <include name="${lib.dir}/*.jar" />
-            <exclude name="${lib.dir}/*sources.jar"/>
-            <exclude name="${lib.dir}/*javadoc.jar"/>
-        </fileset>
-    </path>
-
-    <!-- path: source classes for testing -->
-    <path id="classpath.test">
-        <pathelement location="${classes.dir}" />
-        <path refid="classpath.libraries" />
-    </path>
-</project>
diff --git a/ivy.xml b/ivy.xml
deleted file mode 100644
index 5df0056..0000000
--- a/ivy.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<ivy-module version="2.0">
-    <info organisation="org.apache" module="apk-dependency-graph"/>
-    <dependencies>
-        <!-- https://mvnrepository.com/artifact/org.smali/baksmali -->
-        <dependency org="org.smali" name="baksmali" rev="2.2.5"/>
-        <!-- https://mvnrepository.com/artifact/junit/junit -->
-        <!-- 5th version isn't working with Ant properly -->
-        <!-- It constantly gives the next error: -->
-        <!-- The <classpath> or <modulepath> for <junit> must include junit.jar if not in Ant's own classpath -->
-        <dependency org="junit" name="junit" rev="4.12"/>
-        <!-- https://mvnrepository.com/artifact/org.hamcrest/hamcrest -->
-        <dependency org="org.hamcrest" name="hamcrest" rev="2.1"/>
-    </dependencies>
-</ivy-module>
diff --git a/release.sh b/release.sh
index 80f5a69..fb74679 100755
--- 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
index eeb4040..363c6b3 100644
--- 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
index 92f8634..b7c8f14 100755
--- 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
index cb46618..1ef4292 100644
--- 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.");
         }
     }
 }
\ No newline at end of file