From 40af731eb0c37e84a253ec0992e24c163aac2e72 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Wed, 14 Jun 2017 17:20:21 +0200 Subject: [PATCH 1/8] Update build tools to 26.0.0, for future support of Android O --- build.gradle | 2 +- sample_client/build.gradle | 2 +- test_client/build.gradle | 2 +- test_client/tests/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index ccee2aa3..fd27bf4e 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ dependencies { android { compileSdkVersion 24 - buildToolsVersion '25.0.2' + buildToolsVersion '26.0.0' sourceSets { main { diff --git a/sample_client/build.gradle b/sample_client/build.gradle index b6227ee2..1c4f8be0 100644 --- a/sample_client/build.gradle +++ b/sample_client/build.gradle @@ -10,7 +10,7 @@ dependencies { android { compileSdkVersion 24 - buildToolsVersion "25.0.2" + buildToolsVersion "26.0.0" sourceSets { main { diff --git a/test_client/build.gradle b/test_client/build.gradle index 40235b18..036fa2a1 100644 --- a/test_client/build.gradle +++ b/test_client/build.gradle @@ -12,7 +12,7 @@ dependencies { android { compileSdkVersion 24 - buildToolsVersion "25.0.2" + buildToolsVersion "26.0.0" sourceSets { main { diff --git a/test_client/tests/build.gradle b/test_client/tests/build.gradle index 091978f6..21500299 100644 --- a/test_client/tests/build.gradle +++ b/test_client/tests/build.gradle @@ -7,7 +7,7 @@ dependencies { android { compileSdkVersion 24 - buildToolsVersion "24.0.2" + buildToolsVersion "26.0.0" sourceSets { main { From 2418abf85ea467943b21d34669d597a736635370 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Wed, 14 Jun 2017 17:36:28 +0200 Subject: [PATCH 2/8] Update Travis config to install Android build tools 26.0.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6a458c15..b1a497c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ android: # second 'tools' updates SDK tools 'til last version ** in remote repository number 11 ** (current last one) - tools - platform-tools - - build-tools-25.0.2 + - build-tools-26.0.0 - android-24 - sys-img-armeabi-v7a-android-24 branches: From 19cea29fafca8aca1a91d0ccf5d17138ca0270e4 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Fri, 6 Oct 2017 10:59:06 +0200 Subject: [PATCH 3/8] Delete duplicated update of Android Tools component - no needed anymore, Travis updated Android base environment --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b1a497c7..d4a06167 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,6 @@ jdk: - oraclejdk8 android: components: -# first 'tools' updates SDK tools 'til last version ** in remote repository number 10 ** - - tools -# second 'tools' updates SDK tools 'til last version ** in remote repository number 11 ** (current last one) - tools - platform-tools - build-tools-26.0.0 From 2dde542356282e371d9f87f3953285f127f661b8 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Fri, 6 Oct 2017 11:03:22 +0200 Subject: [PATCH 4/8] Disable automated tests until ported to current Android testing environment --- .travis.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index d4a06167..de78e8c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,19 +13,22 @@ branches: only: - master before_install: -- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI +# After Travis updated image with Android base environment, building via ant is not possible anymore. +# Library tests are old-style tests, and trust on legacy Android ant environment. +# Need to disable tests until they are ported to JUnit 4 and gradle build. +#- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 20M -- emulator -avd test -no-window & +#- emulator -avd test -no-window & - rm pom.xml -- android update project -p . -- chmod +x ./wait_for_emulator.sh -- ./wait_for_emulator.sh +#- android update project -p . +#- chmod +x ./wait_for_emulator.sh +#- ./wait_for_emulator.sh script: -- ant clean -- ant debug -- cd test_client/tests -- ant acceptance-test -- cd ../.. +#- ant clean +#- ant debug +#- cd test_client/tests +#- ant acceptance-test +#- cd ../.. - ./gradlew clean build env: global: From 2109ab98a15d5291d2ba49b899416ece752f94fe Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Mon, 9 Oct 2017 10:59:32 +0200 Subject: [PATCH 5/8] Update build tools to 26.0.2 --- build.gradle | 2 +- sample_client/build.gradle | 2 +- test_client/build.gradle | 2 +- test_client/tests/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index fd27bf4e..003af78e 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ dependencies { android { compileSdkVersion 24 - buildToolsVersion '26.0.0' + buildToolsVersion '26.0.2' sourceSets { main { diff --git a/sample_client/build.gradle b/sample_client/build.gradle index 1c4f8be0..af47091a 100644 --- a/sample_client/build.gradle +++ b/sample_client/build.gradle @@ -10,7 +10,7 @@ dependencies { android { compileSdkVersion 24 - buildToolsVersion "26.0.0" + buildToolsVersion "26.0.2" sourceSets { main { diff --git a/test_client/build.gradle b/test_client/build.gradle index 036fa2a1..f15860c2 100644 --- a/test_client/build.gradle +++ b/test_client/build.gradle @@ -12,7 +12,7 @@ dependencies { android { compileSdkVersion 24 - buildToolsVersion "26.0.0" + buildToolsVersion "26.0.2" sourceSets { main { diff --git a/test_client/tests/build.gradle b/test_client/tests/build.gradle index 21500299..f9f3e2aa 100644 --- a/test_client/tests/build.gradle +++ b/test_client/tests/build.gradle @@ -7,7 +7,7 @@ dependencies { android { compileSdkVersion 24 - buildToolsVersion "26.0.0" + buildToolsVersion "26.0.2" sourceSets { main { From e0a69266081930d3ed5e45a8fb5818211f3dc456 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Mon, 9 Oct 2017 11:00:29 +0200 Subject: [PATCH 6/8] pdate Android SDK Tools to the really last version --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index de78e8c0..9b151e22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ android: components: - tools - platform-tools - - build-tools-26.0.0 + - build-tools-26.0.2 - android-24 - sys-img-armeabi-v7a-android-24 branches: @@ -16,13 +16,17 @@ before_install: # After Travis updated image with Android base environment, building via ant is not possible anymore. # Library tests are old-style tests, and trust on legacy Android ant environment. # Need to disable tests until they are ported to JUnit 4 and gradle build. -#- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI - -c 20M +#- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 20M #- emulator -avd test -no-window & - rm pom.xml #- android update project -p . #- chmod +x ./wait_for_emulator.sh #- ./wait_for_emulator.sh +# +# On the other hand, Travis still uses 'android' command behind the 'components' section update. +# That command is obsolete and cannot update Android SDK Tools after 25.2.5. +# Let's solve it here with the new command 'sdkmanager' +- yes | sdkmanager --verbose tools script: #- ant clean #- ant debug From 132e173078c349cc6ec5917eba96daf464a3404a Mon Sep 17 00:00:00 2001 From: davigonz Date: Wed, 18 Oct 2017 08:48:04 +0200 Subject: [PATCH 7/8] Use sdkmanager command to install Android SDK components --- .travis.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b151e22..33d94ec3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,17 +2,16 @@ sudo: false language: android jdk: - oraclejdk8 -android: - components: - - tools - - platform-tools - - build-tools-26.0.2 - - android-24 - - sys-img-armeabi-v7a-android-24 branches: only: - master -before_install: +install: +# Let's use the new command 'sdkmanager' to install Android SDK components +- yes | sdkmanager --verbose "build-tools;26.0.2" +- yes | sdkmanager --verbose "platform-tools" +- yes | sdkmanager --verbose "tools" +- yes | sdkmanager --verbose "platforms;android-24" +- yes | sdkmanager --verbose "system-images;android-24;default;armeabi-v7a" # After Travis updated image with Android base environment, building via ant is not possible anymore. # Library tests are old-style tests, and trust on legacy Android ant environment. # Need to disable tests until they are ported to JUnit 4 and gradle build. From 826abcfae482080e848bcb00f6d3c7284b1c8ea8 Mon Sep 17 00:00:00 2001 From: davigonz Date: Wed, 18 Oct 2017 09:27:42 +0200 Subject: [PATCH 8/8] Check tools and dependencies installed --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 33d94ec3..4f47975b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,10 @@ install: - yes | sdkmanager --verbose "tools" - yes | sdkmanager --verbose "platforms;android-24" - yes | sdkmanager --verbose "system-images;android-24;default;armeabi-v7a" + +# Check tools and dependencies installed +- yes | sdkmanager --list + # After Travis updated image with Android base environment, building via ant is not possible anymore. # Library tests are old-style tests, and trust on legacy Android ant environment. # Need to disable tests until they are ported to JUnit 4 and gradle build.