From 06917a718990f9e6c463a1d747e5b121bf683dbb Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 28 Jun 2014 02:39:53 +0000
Subject: [PATCH] Fixed jar dependency problems, updated ignores

---
 .mtn-ignore                            |  6 +-----
 app/build.gradle                       |  5 +----
 botejars/build.gradle                  | 28 ++++++++++++++++++++++++++
 app/botejars.xml => botejars/build.xml | 14 +++----------
 settings.gradle                        |  2 +-
 5 files changed, 34 insertions(+), 21 deletions(-)
 create mode 100644 botejars/build.gradle
 rename app/botejars.xml => botejars/build.xml (88%)

diff --git a/.mtn-ignore b/.mtn-ignore
index 72050d8..8dfcbe1 100644
--- a/.mtn-ignore
+++ b/.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
diff --git a/app/build.gradle b/app/build.gradle
index e6240e4..2581555 100644
--- a/app/build.gradle
+++ b/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.+'
diff --git a/botejars/build.gradle b/botejars/build.gradle
new file mode 100644
index 0000000..55d12e9
--- /dev/null
+++ b/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'
+    }
+}
\ No newline at end of file
diff --git a/app/botejars.xml b/botejars/build.xml
similarity index 88%
rename from app/botejars.xml
rename to botejars/build.xml
index b2ec8d2..4903efc 100644
--- a/app/botejars.xml
+++ b/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>
diff --git a/settings.gradle b/settings.gradle
index e7b4def..c888429 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app'
+include ':app', ':botejars'