Make sure JSword gets updated for Travis

This commit is contained in:
Bradlee Speice 2015-06-13 20:02:10 -04:00
parent c3f85c6569
commit 0005ff1869
8 changed files with 19 additions and 36 deletions

View File

@ -5,8 +5,6 @@
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/cardview-v7/22.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../android-sdk-linux/extras/android/m2repository/com/android/support/cardview-v7/22.0.0/cardview-v7-22.0.0-sources.jar!/" />
</SOURCES>
<SOURCES />
</library>
</component>

View File

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="jsword-minimalbible.jsword-minimalbible-1.0-SNAPSHOT">
<CLASSES>
<root url="jar://$PROJECT_DIR$/jsword-minimalbible/build/libs/jsword-minimalbible-1.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@ -5,8 +5,6 @@
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../android-sdk-linux/extras/android/m2repository/com/android/support/recyclerview-v7/22.0.0/recyclerview-v7-22.0.0-sources.jar!/" />
</SOURCES>
<SOURCES />
</library>
</component>

View File

@ -6,8 +6,6 @@
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../android-sdk-linux/extras/android/m2repository/com/android/support/support-v4/22.0.0/support-v4-22.0.0-sources.jar!/" />
</SOURCES>
<SOURCES />
</library>
</component>

View File

@ -53,5 +53,7 @@
<component name="SuppressionsComponent">
<option name="suppComments" value="[]" />
</component>
<component name="UnicodeBrowser">
<option name="fontName" value="Source Code Pro" />
</component>
</project>

View File

@ -14,6 +14,9 @@ before_install:
- openssl aes-256-cbc -K $encrypted_b017c1e684ac_key -iv $encrypted_b017c1e684ac_iv
-in app/src/main/play/play_api.p12.enc -out app/src/main/play/play_api.p12 -d
# We have to make sure the actual JSword is updated
- git submodule update --init --recursive
after_success:
- ./gradlew jacocoTestReport coveralls
- if [ $TRAVIS_TAG ];

View File

@ -4,7 +4,6 @@
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>

View File

@ -12,9 +12,8 @@
<option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugUnitTestSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@ -72,11 +71,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/22.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.orhanobut/logger/1.10/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@ -94,46 +88,46 @@
<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="jdk" jdkName="1.7" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<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="dagger-1.2.2" 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="" name="commons-compress-1.7" 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" />
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-22" level="project" />
<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="lucene-snowball-3.0.3" 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="" name="systembartint-1.0.4" 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="" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="library" exported="" name="butterknife-6.1.0" 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="rxjava-android-0.20.7" 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="javax.inject-1" 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" />