Fixed jar dependency problems, updated ignores

.mtn-ignore

@@ -2,11 +2,7 @@
 ^.settings
 
 # Android-specific ignores
-^bin
-^gen
-^botejars/bin
-^botejars/gen
-^botejars/lib
+^botejars/libs
 lint.xml
 local.properties
 signing.gradle

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.+'

botejars/build.gradle

@@ -0,0 +1,28 @@
+apply plugin: 'java'
+
+task buildJars(type: Exec) {
+    outputs.dir('libs')
+    commandLine 'ant', 'preparebotelibs'
+}
+compileJava.dependsOn buildJars
+
+// TODO an empty botejars.jar is added to the classpath
+
+artifacts.add('default', file('libs/i2p.jar'))
+artifacts.add('default', file('libs/router.jar'))
+artifacts.add('default', file('libs/mstreaming.jar'))
+artifacts.add('default', file('libs/streaming.jar'))
+artifacts.add('default', file('libs/bcprov-ecc-jdk16-146.jar'))
+artifacts.add('default', file('libs/flexi-gmss-1.7p1.jar'))
+artifacts.add('default', file('libs/lzma-9.20.jar'))
+artifacts.add('default', file('libs/ntruenc-1.2.jar'))
+artifacts.add('default', file('libs/scrypt-1.4.0.jar'))
+artifacts.add('default', file('libs/i2pbote.jar'))
+
+clean.dependsOn cleanBuildJars
+
+clean << {
+    exec {
+        commandLine 'ant', 'clean'
+    }
+}

botejars/build.xml

@@ -3,7 +3,7 @@
     <property file="local.properties" />
     <property name="jar.libs.dir" value="libs" />
 
-    <!-- override with i2pbase=path/to/source in local.properties -->
+    <!-- override with i2pbase=path/to/install in local.properties -->
     <property environment="env"/>
     <condition property="i2pbase" value="${env.I2P}">
         <isset property="env.I2P"/>
@@ -25,17 +25,9 @@
     </fail>
     <echo message="Using I2P-Bote source at ${botebase}" />
 
-    <target name="precompile" depends="copyrouterlibs,copybotelibs" />
+    <target name="preparebotelibs" 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>
+    <target name="clean">
         <ant dir="${botebase}" inheritall="false" useNativeBasedir="true" >
             <target name="clean" />
         </ant>

settings.gradle

@@ -1 +1 @@
-include ':app'
+include ':app', ':botejars'