diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e277274 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "jsword-minimalbible"] + path = jsword-minimalbible + url = http://github.com/MinimalBible/jsword-minimalbible +[submodule "jsword"] + path = jsword + url = http://github.com/crosswire/jsword diff --git a/app/build.gradle b/app/build.gradle index 1859dec..27d8aec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,17 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + packagingOptions { + exclude 'META-INF/LICENSE.txt' + exclude 'META-INF/NOTICE.txt' + exclude 'META-INF/DEPENDENCIES' + exclude 'META-INF/LICENSE' + exclude 'META-INF/NOTICE' + } } dependencies { + compile project(path: ':jsword-minimalbible', configuration: 'buildJSword') + compile 'com.android.support:appcompat-v7:20.+' } diff --git a/jsword b/jsword new file mode 160000 index 0000000..b0d6b28 --- /dev/null +++ b/jsword @@ -0,0 +1 @@ +Subproject commit b0d6b287cb03af33e719ba880bce144cb0051d2c diff --git a/jsword-minimalbible b/jsword-minimalbible new file mode 160000 index 0000000..584c931 --- /dev/null +++ b/jsword-minimalbible @@ -0,0 +1 @@ +Subproject commit 584c9314f768e9e09aa6d147287062e2c796263e diff --git a/settings.gradle b/settings.gradle index e7b4def..0b6bec1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,2 @@ include ':app' +include ':jsword-minimalbible'