From a47d007ccb553f1f1ca993bc7b0e5445c723f545 Mon Sep 17 00:00:00 2001
From: DjBushido <bspeice.nc@gmail.com>
Date: Wed, 30 Apr 2014 12:40:37 -0400
Subject: [PATCH] Gradle build now working on Windows

---
 MinimalBible.iml                           |  2 +-
 MinimalBible/AndroidManifest.xml           |  4 ----
 MinimalBible/MinimalBible-MinimalBible.iml |  5 ++++-
 MinimalBible/build.gradle                  | 14 ++++++++++----
 MinimalBible/lint.xml                      |  7 +++++++
 appcompat_v7/appcompat_v7.iml              |  1 +
 appcompat_v7/build.gradle                  |  4 ++++
 7 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 MinimalBible/lint.xml

diff --git a/MinimalBible.iml b/MinimalBible.iml
index 69cbeb4..c87302f 100644
--- a/MinimalBible.iml
+++ b/MinimalBible.iml
@@ -8,7 +8,7 @@
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
-    <orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
diff --git a/MinimalBible/AndroidManifest.xml b/MinimalBible/AndroidManifest.xml
index e82455a..12288b4 100644
--- a/MinimalBible/AndroidManifest.xml
+++ b/MinimalBible/AndroidManifest.xml
@@ -24,10 +24,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="org.bspeice.minimalbible.activities.downloader.DownloaderActivity"
-            android:label="@string/title_activity_downloader" >
-        </activity>
         <activity
             android:name="org.bspeice.minimalbible.activities.downloader.DownloadActivity"
             android:label="@string/title_activity_download" >
diff --git a/MinimalBible/MinimalBible-MinimalBible.iml b/MinimalBible/MinimalBible-MinimalBible.iml
index ba5de4b..8e48656 100644
--- a/MinimalBible/MinimalBible-MinimalBible.iml
+++ b/MinimalBible/MinimalBible-MinimalBible.iml
@@ -51,7 +51,6 @@
       <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" />
@@ -68,6 +67,10 @@
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="android-support-v4" level="project" />
+    <orderEntry type="library" exported="" name="1_android-support-v4" level="project" />
+    <orderEntry type="library" exported="" name="eventbus-2.2.0" level="project" />
+    <orderEntry type="library" exported="" name="systembartint-1.0.3" level="project" />
+    <orderEntry type="library" exported="" name="jsword" level="project" />
     <orderEntry type="library" exported="" name="android-support-v7-appcompat" level="project" />
     <orderEntry type="module" module-name="appcompat_v7" exported="" />
   </component>
diff --git a/MinimalBible/build.gradle b/MinimalBible/build.gradle
index 402f2ca..daa610b 100644
--- a/MinimalBible/build.gradle
+++ b/MinimalBible/build.gradle
@@ -1,10 +1,8 @@
 apply plugin: 'android'
 
-dependencies {
 
-    compile fileTree(dir: 'libs', include: '*.jar') {
-        builtBy 'minimalBibleJSword'
-    }
+dependencies {
+    compile fileTree(dir: 'libs', include: '*.jar')
     compile project(':appcompat_v7')
 }
 
@@ -35,6 +33,14 @@ android {
         debug.setRoot('build-types/debug')
         release.setRoot('build-types/release')
     }
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
+    }
 }
 
 task minimalBibleJSword (type: GradleBuild) { GradleBuild antBuild ->
diff --git a/MinimalBible/lint.xml b/MinimalBible/lint.xml
new file mode 100644
index 0000000..8a3963d
--- /dev/null
+++ b/MinimalBible/lint.xml
@@ -0,0 +1,7 @@
+<?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/appcompat_v7/appcompat_v7.iml b/appcompat_v7/appcompat_v7.iml
index b7d7f06..6bbfd66 100644
--- a/appcompat_v7/appcompat_v7.iml
+++ b/appcompat_v7/appcompat_v7.iml
@@ -14,6 +14,7 @@
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
         <option name="LIBRARY_PROJECT" value="true" />
       </configuration>
     </facet>
diff --git a/appcompat_v7/build.gradle b/appcompat_v7/build.gradle
index 64a770f..2c144a5 100644
--- a/appcompat_v7/build.gradle
+++ b/appcompat_v7/build.gradle
@@ -31,4 +31,8 @@ android {
         debug.setRoot('build-types/debug')
         release.setRoot('build-types/release')
     }
+
+    lintOptions {
+        abortOnError false
+    }
 }