From 0a4f467a39ad664c060b31be76b544a804304c8a Mon Sep 17 00:00:00 2001
From: Bradlee Speice <bspeice.nc@gmail.com>
Date: Wed, 30 Apr 2014 22:27:05 -0400
Subject: [PATCH] Build totally working!

---
 MinimalBible/MinimalBible-MinimalBible.iml | 1 +
 MinimalBible/build.gradle                  | 9 ++-------
 MinimalBible/jsword-stub.gradle            | 1 -
 MinimalBible/lint.xml                      | 7 -------
 settings.gradle                            | 1 +
 5 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 MinimalBible/jsword-stub.gradle
 delete mode 100644 MinimalBible/lint.xml

diff --git a/MinimalBible/MinimalBible-MinimalBible.iml b/MinimalBible/MinimalBible-MinimalBible.iml
index 8e48656..ec1a19d 100644
--- a/MinimalBible/MinimalBible-MinimalBible.iml
+++ b/MinimalBible/MinimalBible-MinimalBible.iml
@@ -51,6 +51,7 @@
       <sourceFolder url="file://$MODULE_DIR$/tests/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/tests/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/tests/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/build/apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/assets" />
diff --git a/MinimalBible/build.gradle b/MinimalBible/build.gradle
index 192458b..9045047 100644
--- a/MinimalBible/build.gradle
+++ b/MinimalBible/build.gradle
@@ -1,11 +1,10 @@
 apply plugin: 'android'
 
-
 dependencies {
     compile fileTree('libs') {
         include '*.jar'
-        builtBy 'minimalBibleJSword'
     }
+	compile project(path: ':jsword-minimalbible', configuration: 'buildJSword')
     compile project(':appcompat_v7')
 }
 
@@ -46,8 +45,4 @@ android {
     }
 }
 
-task minimalBibleJSword (type: GradleBuild) { GradleBuild antBuild ->
-    antBuild.buildFile('jsword-stub.gradle')
-    antBuild.tasks = ['clean', 'ivy.check', 'ivy.download', 'ivy.task', 'ivy',
-            'init', 'mergeCode', 'compile', 'jar', 'copyJarsToMinimalBible']
-}
\ No newline at end of file
+
diff --git a/MinimalBible/jsword-stub.gradle b/MinimalBible/jsword-stub.gradle
deleted file mode 100644
index 7651546..0000000
--- a/MinimalBible/jsword-stub.gradle
+++ /dev/null
@@ -1 +0,0 @@
-ant.importBuild('../jsword-minimalbible/build.xml')
\ No newline at end of file
diff --git a/MinimalBible/lint.xml b/MinimalBible/lint.xml
deleted file mode 100644
index 8a3963d..0000000
--- a/MinimalBible/lint.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-    <!-- Disable this given check in this project -->
-    <issue id="InvalidPackage">
-        <ignore path="libs/jsword.jar"/>
-    </issue>
-</lint>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 801a6f2..3a495ec 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,3 @@
 include ':appcompat_v7'
 include ':MinimalBible'
+include ':jsword-minimalbible'