From 787f1b87468a94499e176924939902280b9d85a7 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sun, 5 Apr 2015 17:01:13 -0400 Subject: [PATCH] More build process cleanups --- .travis.yml | 5 ++--- android_install.sh | 6 ++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a405f16..7cf3954 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ env: global: - secure: FFXEK5dnQaJ2nSyaggVO66uNfpM6WYdS962qjY4ry9OumoK9OHg25MeQPrWmQurUaDDRfzdjMTs0UicWvJAnka846dDpYVbt0bpWbnNsq8vb05h1XhCsjjnEwcgPzbbyoAecmx7m1noAhkjFVnqmUhnjoYIsNd/pIRplO+r+0PY= - secure: BezK2LQRlHA4bgfShHH9l8/N0roGcMCxzAXV3CoGw4OWp6npUbIGvj1H4scA2OAMpct7u6fS9T0//FQehe6tbsHniVfsRxrmwsj8SqXQ6E3tQ4lZeFu9q6dy2qgIaktY9q2SIkf+/1DG5b7gd/KJX4luU8LX1RErorco6+MGuoQ= + - secure: ST7fOgOrFFcjmxvnfu0mlQIi1uQ3/59hQk/LDRjucPCvhW1XjSfJVZvT7k9qgX7lgQf+fie0UekR26bX4RdxcJxLkJ9QH0ykr2WFlGWqXRuI0QcFMM4JMhwzCR65+2JMeI77SRvPLvCCRUO2thAEFze+rICqzIjwghcf4/2tc6w= 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 @@ -13,7 +14,5 @@ script: - ./gradlew test after_success: - ./gradlew jacocoTestReport coveralls -- if [ $TRAVIS_TAG ]; then - echo "Publishing to Play store..." - ./gradlew publishRelease +- if [ $TRAVIS_TAG ]; then echo "Publishing to Play store..." ./gradlew publishRelease fi diff --git a/android_install.sh b/android_install.sh index e49b63f..33dc0f0 100644 --- a/android_install.sh +++ b/android_install.sh @@ -9,14 +9,16 @@ extra-android-m2repository extra-android-support extra-google-m2repository" +SDK_VERSION="24.1.2" + echo "Updating packages..." sudo apt-get update -qq echo "Installing Android dependencies..." sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch -wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz -tar -zxf android-sdk_r23.0.2-linux.tgz +wget http://dl.google.com/android/android-sdk_r${SDK_VERSION}-linux.tgz +tar -zxf android-sdk_r${SDK_VERSION}-linux.tgz for COMP in ${COMPONENTS} do