Build totally working!

This commit is contained in:
Bradlee Speice 2014-04-30 22:27:05 -04:00
parent 83448dc9c7
commit 0a4f467a39
5 changed files with 4 additions and 15 deletions

View File

@ -51,6 +51,7 @@
<sourceFolder url="file://$MODULE_DIR$/tests/rs" isTestSource="true" /> <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/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/tests/resources" 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$/.settings" />
<excludeFolder url="file://$MODULE_DIR$/build/apk" /> <excludeFolder url="file://$MODULE_DIR$/build/apk" />
<excludeFolder url="file://$MODULE_DIR$/build/assets" /> <excludeFolder url="file://$MODULE_DIR$/build/assets" />

View File

@ -1,11 +1,10 @@
apply plugin: 'android' apply plugin: 'android'
dependencies { dependencies {
compile fileTree('libs') { compile fileTree('libs') {
include '*.jar' include '*.jar'
builtBy 'minimalBibleJSword'
} }
compile project(path: ':jsword-minimalbible', configuration: 'buildJSword')
compile project(':appcompat_v7') 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']
}

View File

@ -1 +0,0 @@
ant.importBuild('../jsword-minimalbible/build.xml')

View File

@ -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>

View File

@ -1,2 +1,3 @@
include ':appcompat_v7' include ':appcompat_v7'
include ':MinimalBible' include ':MinimalBible'
include ':jsword-minimalbible'