Fixed jar dependency problems, updated ignores

app/botejars.xml

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="botejars-imported">
-    <property file="local.properties" />
-    <property name="jar.libs.dir" value="libs" />
-
-    <!-- override with i2pbase=path/to/source in local.properties -->
-    <property environment="env"/>
-    <condition property="i2pbase" value="${env.I2P}">
-        <isset property="env.I2P"/>
-    </condition>
-
-    <property name="i2plib" value="${i2pbase}/lib"/>
-
-    <!-- override with botesrc=path/to/source in local.properties -->
-    <property name="botesrc" value="../i2p.i2p-bote" />
-    <property name="botebase" location="${botesrc}" />
-    <property name="botelib" location="${botebase}/WebContent/WEB-INF/lib" />
-    <available file="${botebase}" property="bote.present" />
-    <fail message="I2P-Bote source directory ${botebase} was not found. Install it there or set botesrc=/path/to/source in local.properties" >
-        <condition>
-            <not>
-                <isset property="bote.present" />
-            </not>
-        </condition>
-    </fail>
-    <echo message="Using I2P-Bote source at ${botebase}" />
-
-    <target name="precompile" depends="copyrouterlibs,copybotelibs" />
-
-    <target name="preclean">
-        <delete verbose="${verbose}">
-            <fileset dir="${jar.libs.dir}">
-                <exclude name="mail.jar" />
-                <exclude name="additionnal.jar" />
-                <exclude name="activation.jar" />
-                <exclude name="tokenautocomplete.jar" />
-            </fileset>
-        </delete>
-        <ant dir="${botebase}" inheritall="false" useNativeBasedir="true" >
-            <target name="clean" />
-        </ant>
-    </target>
-
-    <!-- new rules -->
-
-    <target name="checki2pbase">
-        <fail unless="i2pbase" message="The I2P environment variable is not set.${line.separator}It must point to an I2P installation. It is usually a path of the form ${line.separator}/xxx/yyy/i2p."/>
-    </target>
-
-    <target name="copyrouterlibs" depends="checki2pbase" >
-        <!-- core -->
-        <!-- remove classes that are overridden -->
-        <!-- lots of unneeded stuff could be deleted here -->
-        <jar destfile="${jar.libs.dir}/i2p.jar" >
-            <zipfileset src="${i2plib}/i2p.jar" >
-                <exclude name="net/i2p/util/LogWriter.class" />
-            </zipfileset>
-        </jar>
-
-        <!-- router -->
-        <copy file="${i2plib}/router.jar" todir="${jar.libs.dir}" />
-
-        <!-- streaming -->
-        <copy file="${i2plib}/mstreaming.jar" todir="${jar.libs.dir}" />
-        <copy file="${i2plib}/streaming.jar" todir="${jar.libs.dir}" />
-    </target>
-
-    <available property="have.bote" file="${botelib}/i2pbote.jar" />
-
-    <target name="buildbote" unless="have.bote">
-        <ant dir="${botebase}" inheritall="false" useNativeBasedir="true" >
-            <property name="i2pbase" value="${i2pbase}" />
-            <target name="jar" />
-        </ant>
-    </target>
-
-    <target name="copybotelibs" depends="buildbote">
-        <!-- bote -->
-        <jar destfile="${jar.libs.dir}/i2pbote.jar" >
-            <!-- remove classes that are overridden or stubbed out -->
-            <zipfileset src="${botelib}/i2pbote.jar" >
-                <exclude name="i2p/bote/imap/" />
-                <exclude name="i2p/bote/service/seedless/" />
-                <exclude name="i2p/bote/smtp/" />
-            </zipfileset>
-            <!-- Include necessary deps for stubbed-out classes -->
-            <zipfileset src="${botelib}/commons-lang-2.6.jar" >
-                <include name="org/apache/commons/lang/exception/Nestable.class" />
-                <include name="org/apache/commons/lang/exception/NestableException.class" />
-            </zipfileset>
-            <zipfileset src="${botelib}/commons-configuration-1.6.jar" >
-                <include name="org/apache/commons/configuration/ConfigurationException.class" />
-            </zipfileset>
-        </jar>
-
-        <!-- bote deps -->
-        <copy todir="${jar.libs.dir}">
-            <fileset dir="${botelib}">
-                <include name="bcprov-ecc-jdk16-146.jar" />
-                <!-- Regular JavaMail currently doesn't work on Android
-                <include name="mailapi.jar" />-->
-                <include name="lzma-9.20.jar" />
-                <include name="ntruenc-1.2.jar" />
-                <include name="flexi-gmss-1.7p1.jar" />
-                <include name="scrypt-1.4.0.jar" />
-            </fileset>
-        </copy>
-    </target>
-</project>

app/build.gradle

@@ -17,11 +17,8 @@ android {
     }
 }
 
-ant.importBuild('botejars.xml')
-preBuild.dependsOn precompile
-clean.dependsOn preclean
-
 dependencies {
+    compile project(':botejars')
     compile fileTree(dir: 'libs', include: '*.jar')
     compile 'com.android.support:support-v4:19.+'
     compile 'com.android.support:appcompat-v7:19.+'