diff --git a/.gitignore b/.gitignore
index deb32fa..d115723 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ local.properties
/MinimalBible/.gradle
/appcompat_v7/build
/.idea
+*.iml
diff --git a/MinimalBible.iml b/MinimalBible.iml
deleted file mode 100644
index c87302f..0000000
--- a/MinimalBible.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/MinimalBible/MinimalBible-MinimalBible.iml b/MinimalBible/MinimalBible-MinimalBible.iml
deleted file mode 100644
index ec1a19d..0000000
--- a/MinimalBible/MinimalBible-MinimalBible.iml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/MinimalBible/build.gradle b/MinimalBible/build.gradle
index 9045047..9680a1c 100644
--- a/MinimalBible/build.gradle
+++ b/MinimalBible/build.gradle
@@ -1,11 +1,39 @@
apply plugin: 'android'
+apply plugin: 'android-apt'
+
+buildscript {
+ repositories {
+ mavenCentral()
+ }
+ dependencies {
+ classpath 'com.neenbedankt.gradle.plugins:android-apt:1.2+'
+ }
+}
+
+repositories {
+ mavenCentral()
+}
dependencies {
- compile fileTree('libs') {
- include '*.jar'
- }
- compile project(path: ':jsword-minimalbible', configuration: 'buildJSword')
+ compile project(path: ':jsword-minimalbible', configuration: 'buildJSword')
compile project(':appcompat_v7')
+
+ apt "org.androidannotations:androidannotations:3.0+"
+ compile "org.androidannotations:androidannotations-api:3.0+"
+
+ apt 'com.squareup.dagger:dagger-compiler:1.1.0'
+ compile 'com.squareup.dagger:dagger:1.1.0'
+
+ compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
+ compile 'de.greenrobot:eventbus:2.2.0'
+ compile 'com.google.android:support-v4:r7'
+}
+
+apt {
+ arguments {
+ androidManifestFile variant.processResources.manifestFile
+ resourcePackageName "org.bspeice.minimalbible"
+ }
}
android {
diff --git a/MinimalBible/libs/.gitignore b/MinimalBible/libs/.gitignore
index f007124..d392f0e 100644
--- a/MinimalBible/libs/.gitignore
+++ b/MinimalBible/libs/.gitignore
@@ -1,18 +1 @@
-/commons-codec-1.9.jar
-/commons-compress-1.7.jar
-/commons-net-3.3.jar
-/hamcrest-core-1.3.jar
-/hamcrest-library-1.3.jar
-/httpclient-4.3.2.jar
-/httpcore-4.3.2.jar
-/icu4j-52.1.jar
-/jcl-over-slf4j-1.7.6.jar
-/jdom2-2.0.5.jar
-/junit-4.11.jar
-/lucene-analyzers-3.0.3.jar
-/lucene-core-3.0.3.jar
-/lucene-smartcn-3.0.3.jar
-/lucene-snowball-3.0.3.jar
-/slf4j-api-1.7.6.jar
-/slf4j-jdk14-1.7.6.jar
-/xz-1.4.jar
+*.jar
diff --git a/MinimalBible/libs/android-support-v4.jar b/MinimalBible/libs/android-support-v4.jar
deleted file mode 100644
index a7e9919..0000000
Binary files a/MinimalBible/libs/android-support-v4.jar and /dev/null differ
diff --git a/MinimalBible/libs/eventbus-2.2.0.jar b/MinimalBible/libs/eventbus-2.2.0.jar
deleted file mode 100644
index e32db28..0000000
Binary files a/MinimalBible/libs/eventbus-2.2.0.jar and /dev/null differ
diff --git a/MinimalBible/libs/systembartint-1.0.3.jar b/MinimalBible/libs/systembartint-1.0.3.jar
deleted file mode 100644
index 8816fde..0000000
Binary files a/MinimalBible/libs/systembartint-1.0.3.jar and /dev/null differ
diff --git a/appcompat_v7/appcompat_v7.iml b/appcompat_v7/appcompat_v7.iml
deleted file mode 100644
index 6bbfd66..0000000
--- a/appcompat_v7/appcompat_v7.iml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/jsword-minimalbible b/jsword-minimalbible
index 2b091f4..2bead88 160000
--- a/jsword-minimalbible
+++ b/jsword-minimalbible
@@ -1 +1 @@
-Subproject commit 2b091f4a2bf812b379f156211168eb33814e1cf2
+Subproject commit 2bead8897d20139e073969279278acd0ebe29615