Updates for Travis

This commit is contained in:
Bradlee Speice
2015-06-13 19:41:40 -04:00
parent e756ec8c28
commit 1a93f2e874
22 changed files with 43 additions and 252 deletions

View File

@ -90,49 +90,25 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0-rc3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-2.0.14-beta" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="spek-0.1.165" level="project" />
<orderEntry type="library" exported="" name="guava-15.0" level="project" />
<orderEntry type="library" exported="" name="xz-1.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-2.0.14-beta" level="project" />
<orderEntry type="library" exported="" name="dagger-1.2.2" level="project" />
<orderEntry type="library" exported="" name="lucene-analyzers-3.0.3" level="project" />
<orderEntry type="library" exported="" name="dagger-compiler-1.2.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="objenesis-2.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="cglib-nodep-3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
<orderEntry type="library" exported="" name="commons-compress-1.7" level="project" />
<orderEntry type="library" exported="" name="esperandro-2.2.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0-rc3" level="project" />
<orderEntry type="library" exported="" name="kotlin-stdlib-0.12.213" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0-rc3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
<orderEntry type="library" exported="" name="esperandro-api-2.2.0" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-22.0.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0-rc3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
<orderEntry type="library" exported="" name="httpcore-4.3.2" level="project" />
<orderEntry type="library" exported="" name="lucene-smartcn-3.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="byte-buddy-0.6.8" level="project" />
<orderEntry type="library" exported="" name="commons-lang3-3.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="awaitility-1.6.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="spek-0.1.165" level="project" />
<orderEntry type="library" exported="" name="guava-15.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
<orderEntry type="library" exported="" name="dagger-1.2.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="cglib-nodep-3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0-rc3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-22.0.0" level="project" />
<orderEntry type="library" exported="" name="rxjava-core-0.20.7" level="project" />
<orderEntry type="library" exported="" name="acra-4.6.2" level="project" />
@ -140,20 +116,27 @@
<orderEntry type="library" exported="" name="logger-1.10" level="project" />
<orderEntry type="library" exported="" name="annotations-4.1.1.4" level="project" />
<orderEntry type="library" exported="" name="lucene-snowball-3.0.3" level="project" />
<orderEntry type="library" exported="" name="kotlin-stdlib-0.12.213" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
<orderEntry type="library" exported="" name="systembartint-1.0.4" level="project" />
<orderEntry type="library" exported="" name="lucene-core-3.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
<orderEntry type="library" exported="" name="butterknife-6.1.0" level="project" />
<orderEntry type="library" exported="" name="slf4j-api-1.7.6" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="library" exported="" name="esperandro-api-2.2.0" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-22.0.0" level="project" />
<orderEntry type="library" exported="" name="rxjava-android-0.20.7" level="project" />
<orderEntry type="library" exported="" name="slf4j-api-1.7.6" level="project" />
<orderEntry type="library" exported="" name="httpcore-4.3.2" level="project" />
<orderEntry type="library" exported="" name="lucene-smartcn-3.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="byte-buddy-0.6.8" level="project" />
<orderEntry type="library" exported="" name="javax.inject-1" level="project" />
<orderEntry type="library" exported="" name="javawriter-2.5.1" level="project" />
<orderEntry type="library" exported="" name="commons-lang3-3.4" level="project" />
<orderEntry type="library" exported="" name="kotlin-runtime-0.12.213" level="project" />
<orderEntry type="library" exported="" name="commons-net-3.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="awaitility-1.6.3" level="project" />
<orderEntry type="library" exported="" name="jdom2-2.0.5" level="project" />
<orderEntry type="module" module-name="jsword-minimalbible" scope="TEST" />
</component>
</module>

View File

@ -22,18 +22,15 @@ apply plugin: 'play'
android {
compileSdkVersion 22
buildToolsVersion '21.1.2'
defaultConfig {
applicationId 'org.bspeice.minimalbible'
minSdkVersion 8
targetSdkVersion 22
def travis_code = System.getenv("TRAVIS_BUILD_NUMBER")
if (travis_code)
versionCode travis_code.toInteger()
else
versionCode 0
versionName '0.7'
versionCode System.getenv("TRAVIS_BUILD_NUMBER")?.toInteger() ?: 0
}
packagingOptions {
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt'
@ -46,6 +43,7 @@ android {
exclude 'NOTICE'
exclude 'asm-license.txt'
}
signingConfigs {
release {
storeFile file('src/main/play/MinimalBible.jks')
@ -54,11 +52,13 @@ android {
keyPassword System.getenv("KEYSTORE_PASSWORD")
}
}
buildTypes {
release {
signingConfig signingConfigs.release
}
}
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
test.java.srcDirs += 'src/test/kotlin'