From 363414eac102e2ec497e2ef83e3e23523ff96fb0 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 19 Jan 2018 09:58:25 -0600 Subject: [PATCH 1/3] Build for any SDK on Travis. --- .travis.yml | 12 ++---------- Parse/build.gradle | 3 +-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3b1a5300b..6cc997657 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,22 +4,14 @@ branches: - /^\d+\.\d+\.\d+$/ # regex language: android -sudo: false jdk: - oraclejdk8 -android: - components: - - tools - - platform-tools - - build-tools-27.0.0 - - android-27 - - doc-27 - before_install: - pip install --user codecov - - yes | sdkmanager "platforms;android-27" + - mkdir "$ANDROID_HOME/licenses" || true + - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license" script: - ./gradlew clean testDebugUnitTest jacocoTestReport diff --git a/Parse/build.gradle b/Parse/build.gradle index be853fe63..90f0d9a17 100644 --- a/Parse/build.gradle +++ b/Parse/build.gradle @@ -25,7 +25,6 @@ buildscript { android { compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion @@ -51,7 +50,7 @@ android { } ext { - okhttpVersion = '3.9.0' + okhttpVersion = '3.9.1' } dependencies { From b51d415e48113b595f05509ee2f6499269c86708 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 31 Jan 2018 11:17:19 -0600 Subject: [PATCH 2/3] Use sdkmanager to approve licenses --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6cc997657..3d9bf10e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,7 @@ jdk: before_install: - pip install --user codecov - - mkdir "$ANDROID_HOME/licenses" || true - - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license" + - yes | sdkmanager --licenses script: - ./gradlew clean testDebugUnitTest jacocoTestReport From 76b6cf3b1e04360fea0860cfda37e15d363dca71 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 31 Jan 2018 11:17:19 -0600 Subject: [PATCH 3/3] Revert "Use sdkmanager to approve licenses" This reverts commit b51d415e48113b595f05509ee2f6499269c86708. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3d9bf10e1..6cc997657 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,8 @@ jdk: before_install: - pip install --user codecov - - yes | sdkmanager --licenses + - mkdir "$ANDROID_HOME/licenses" || true + - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license" script: - ./gradlew clean testDebugUnitTest jacocoTestReport