From 1a93f2e874d007a51390ec463f909e23b7c0fab8 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sat, 13 Jun 2015 19:41:40 -0400 Subject: [PATCH] Updates for Travis --- .../accessibility_test_framework_1_0.xml | 11 ---- .idea/libraries/ant_1_8_0.xml | 9 --- .idea/libraries/ant_launcher_1_8_0.xml | 9 --- .idea/libraries/asm_5_0_1.xml | 11 ---- .idea/libraries/asm_analysis_5_0_1.xml | 11 ---- .idea/libraries/asm_commons_5_0_1.xml | 11 ---- .idea/libraries/asm_tree_5_0_1.xml | 11 ---- .idea/libraries/asm_util_5_0_1.xml | 11 ---- .idea/libraries/bcprov_jdk16_1_46.xml | 11 ---- .idea/libraries/icu4j_53_1.xml | 11 ---- .idea/libraries/maven_ant_tasks_2_1_3.xml | 11 ---- .idea/libraries/robolectric_3_0_rc3.xml | 11 ---- .../robolectric_annotations_3_0_rc3.xml | 11 ---- .../robolectric_resources_3_0_rc3.xml | 11 ---- .idea/libraries/robolectric_utils_3_0_rc3.xml | 11 ---- .idea/libraries/shadows_core_3_0_rc3.xml | 11 ---- .idea/libraries/sqlite4java_0_282.xml | 11 ---- .idea/libraries/vtd_xml_2_11.xml | 11 ---- .travis.yml | 32 ++++++----- app/app.iml | 55 +++++++------------ app/build.gradle | 12 ++-- build.gradle | 2 +- 22 files changed, 43 insertions(+), 252 deletions(-) delete mode 100644 .idea/libraries/accessibility_test_framework_1_0.xml delete mode 100644 .idea/libraries/ant_1_8_0.xml delete mode 100644 .idea/libraries/ant_launcher_1_8_0.xml delete mode 100644 .idea/libraries/asm_5_0_1.xml delete mode 100644 .idea/libraries/asm_analysis_5_0_1.xml delete mode 100644 .idea/libraries/asm_commons_5_0_1.xml delete mode 100644 .idea/libraries/asm_tree_5_0_1.xml delete mode 100644 .idea/libraries/asm_util_5_0_1.xml delete mode 100644 .idea/libraries/bcprov_jdk16_1_46.xml delete mode 100644 .idea/libraries/icu4j_53_1.xml delete mode 100644 .idea/libraries/maven_ant_tasks_2_1_3.xml delete mode 100644 .idea/libraries/robolectric_3_0_rc3.xml delete mode 100644 .idea/libraries/robolectric_annotations_3_0_rc3.xml delete mode 100644 .idea/libraries/robolectric_resources_3_0_rc3.xml delete mode 100644 .idea/libraries/robolectric_utils_3_0_rc3.xml delete mode 100644 .idea/libraries/shadows_core_3_0_rc3.xml delete mode 100644 .idea/libraries/sqlite4java_0_282.xml delete mode 100644 .idea/libraries/vtd_xml_2_11.xml diff --git a/.idea/libraries/accessibility_test_framework_1_0.xml b/.idea/libraries/accessibility_test_framework_1_0.xml deleted file mode 100644 index f1c9d12..0000000 --- a/.idea/libraries/accessibility_test_framework_1_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/ant_1_8_0.xml b/.idea/libraries/ant_1_8_0.xml deleted file mode 100644 index 67cb948..0000000 --- a/.idea/libraries/ant_1_8_0.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/ant_launcher_1_8_0.xml b/.idea/libraries/ant_launcher_1_8_0.xml deleted file mode 100644 index 2dce35f..0000000 --- a/.idea/libraries/ant_launcher_1_8_0.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/asm_5_0_1.xml b/.idea/libraries/asm_5_0_1.xml deleted file mode 100644 index 283ec5c..0000000 --- a/.idea/libraries/asm_5_0_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/asm_analysis_5_0_1.xml b/.idea/libraries/asm_analysis_5_0_1.xml deleted file mode 100644 index 6d8c202..0000000 --- a/.idea/libraries/asm_analysis_5_0_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/asm_commons_5_0_1.xml b/.idea/libraries/asm_commons_5_0_1.xml deleted file mode 100644 index dc61cb1..0000000 --- a/.idea/libraries/asm_commons_5_0_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/asm_tree_5_0_1.xml b/.idea/libraries/asm_tree_5_0_1.xml deleted file mode 100644 index cb7a1e8..0000000 --- a/.idea/libraries/asm_tree_5_0_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/asm_util_5_0_1.xml b/.idea/libraries/asm_util_5_0_1.xml deleted file mode 100644 index e07f4ed..0000000 --- a/.idea/libraries/asm_util_5_0_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/bcprov_jdk16_1_46.xml b/.idea/libraries/bcprov_jdk16_1_46.xml deleted file mode 100644 index 2b9e094..0000000 --- a/.idea/libraries/bcprov_jdk16_1_46.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/icu4j_53_1.xml b/.idea/libraries/icu4j_53_1.xml deleted file mode 100644 index 1c73fa3..0000000 --- a/.idea/libraries/icu4j_53_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/maven_ant_tasks_2_1_3.xml b/.idea/libraries/maven_ant_tasks_2_1_3.xml deleted file mode 100644 index 22fe762..0000000 --- a/.idea/libraries/maven_ant_tasks_2_1_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/robolectric_3_0_rc3.xml b/.idea/libraries/robolectric_3_0_rc3.xml deleted file mode 100644 index f35eb1f..0000000 --- a/.idea/libraries/robolectric_3_0_rc3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/robolectric_annotations_3_0_rc3.xml b/.idea/libraries/robolectric_annotations_3_0_rc3.xml deleted file mode 100644 index 87305d6..0000000 --- a/.idea/libraries/robolectric_annotations_3_0_rc3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/robolectric_resources_3_0_rc3.xml b/.idea/libraries/robolectric_resources_3_0_rc3.xml deleted file mode 100644 index 3cc2ca0..0000000 --- a/.idea/libraries/robolectric_resources_3_0_rc3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/robolectric_utils_3_0_rc3.xml b/.idea/libraries/robolectric_utils_3_0_rc3.xml deleted file mode 100644 index b8914db..0000000 --- a/.idea/libraries/robolectric_utils_3_0_rc3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/shadows_core_3_0_rc3.xml b/.idea/libraries/shadows_core_3_0_rc3.xml deleted file mode 100644 index ca6b9d5..0000000 --- a/.idea/libraries/shadows_core_3_0_rc3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/sqlite4java_0_282.xml b/.idea/libraries/sqlite4java_0_282.xml deleted file mode 100644 index 8866bc2..0000000 --- a/.idea/libraries/sqlite4java_0_282.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/vtd_xml_2_11.xml b/.idea/libraries/vtd_xml_2_11.xml deleted file mode 100644 index fe8507f..0000000 --- a/.idea/libraries/vtd_xml_2_11.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 1b9fd96..8f9b2cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,21 @@ -language: java +language: android env: - matrix: - - ANDROID_HOME="./android-sdk-linux" global: - - secure: FFXEK5dnQaJ2nSyaggVO66uNfpM6WYdS962qjY4ry9OumoK9OHg25MeQPrWmQurUaDDRfzdjMTs0UicWvJAnka846dDpYVbt0bpWbnNsq8vb05h1XhCsjjnEwcgPzbbyoAecmx7m1noAhkjFVnqmUhnjoYIsNd/pIRplO+r+0PY= - - secure: jrti7lGbCxscGDzOVgcVuIMSFnTUfJSbL5VtvhZXKllRoKeuM4tJ8HMubUKG0UXR0VGZl3XPcj3Ga7W6gxxSOavA9zmkT1kC9v/ya9QPQI1hCn1kq0GESxj3uFeYyiSa3T/0GcEO0bB660ttRSfpSwQ+MZknJUzIIdTt7K3LjXA= + - secure: FFXEK5dnQaJ2nSyaggVO66uNfpM6WYdS962qjY4ry9OumoK9OHg25MeQPrWmQurUaDDRfzdjMTs0UicWvJAnka846dDpYVbt0bpWbnNsq8vb05h1XhCsjjnEwcgPzbbyoAecmx7m1noAhkjFVnqmUhnjoYIsNd/pIRplO+r+0PY= + - secure: jrti7lGbCxscGDzOVgcVuIMSFnTUfJSbL5VtvhZXKllRoKeuM4tJ8HMubUKG0UXR0VGZl3XPcj3Ga7W6gxxSOavA9zmkT1kC9v/ya9QPQI1hCn1kq0GESxj3uFeYyiSa3T/0GcEO0bB660ttRSfpSwQ+MZknJUzIIdTt7K3LjXA= + +android: + components: + - platform-tools + - tools + 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 -- bash android_install.sh -script: -- ./gradlew test --stacktrace + - 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 + after_success: -- ./gradlew jacocoTestReport coveralls -- if [ $TRAVIS_TAG ]; - then echo "Publishing to Play store..."; - ./gradlew publishRelease; - fi + - ./gradlew jacocoTestReport coveralls + - if [ $TRAVIS_TAG ]; + then echo "Publishing to Play store..."; + ./gradlew publishRelease; + fi diff --git a/app/app.iml b/app/app.iml index 87b80cb..818231f 100644 --- a/app/app.iml +++ b/app/app.iml @@ -90,49 +90,25 @@ + + - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -140,20 +116,27 @@ + - - + - + + + + + + + + + - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 7ea1f74..e85aeed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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' diff --git a/build.gradle b/build.gradle index 71e1714..904a58a 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:+' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files