From 7399f3958cd7ad04be143c54f5107342aa7d1892 Mon Sep 17 00:00:00 2001 From: Carlos Cepeda Date: Mon, 2 Sep 2019 13:51:55 -0500 Subject: [PATCH 1/7] Update .travis.yml Using OpenJDK instead. In an attempt to fiz the script. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0ec8e413..2cdec3c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: android sudo: false cache: false -jdk: oraclejdk7 +jdk: openjdk env: global: - ANDROID_TARGET=android-23 From b3fd047d4b7a3acfbaa4042532ed510b2d95029b Mon Sep 17 00:00:00 2001 From: Carlos Cepeda Date: Mon, 2 Sep 2019 13:57:29 -0500 Subject: [PATCH 2/7] Update .travis.yml --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2cdec3c3..d6d1d7e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,9 @@ env: - ADB_INSTALL_TIMEOUT=20 # minutes (2 minutes by default) - ACDISPLAY_USE_TEST_KEY=true +dist: trusty + + android: components: - platform-tools From 3ceb61326a1d619d75157f68661a1c1e48b73454 Mon Sep 17 00:00:00 2001 From: Carlos Cepeda Date: Mon, 2 Sep 2019 13:59:13 -0500 Subject: [PATCH 3/7] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d6d1d7e4..d63bb68e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: android sudo: false cache: false -jdk: openjdk +jdk: openjdk8 env: global: - ANDROID_TARGET=android-23 From b8321ff5d85a09480f8b7922d6adf8fb149b4aeb Mon Sep 17 00:00:00 2001 From: Carlos Cepeda Date: Mon, 2 Sep 2019 14:43:32 -0500 Subject: [PATCH 4/7] Update .travis.yml 'no-audio' flag is no longer available on modern emulators. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d63bb68e..16fc0f59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ before_script: # Run emulator - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI - - emulator -avd test -no-skin -no-audio -no-window & + - emulator -avd test -no-skin -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & From 24c20f3a84acacc9715b29c7a80a6a09fb1718d1 Mon Sep 17 00:00:00 2001 From: Carlos Cepeda Date: Tue, 3 Sep 2019 09:37:33 -0500 Subject: [PATCH 5/7] Update .travis.yml build tools exactly as gradle --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 16fc0f59..9761d9ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ android: components: - platform-tools - tools - - build-tools-23.0.2 + - build-tools-25.0.0 - android-23 # Extras - extra-android-m2repository From dfad8ffc6de055d18c87fd5621c461f1a776d906 Mon Sep 17 00:00:00 2001 From: Carlos Cepeda Date: Tue, 3 Sep 2019 09:57:27 -0500 Subject: [PATCH 6/7] Update build.gradle Force the annotation library in test --- project/app/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project/app/build.gradle b/project/app/build.gradle index 8fbdd0af..cb0922cd 100644 --- a/project/app/build.gradle +++ b/project/app/build.gradle @@ -187,7 +187,8 @@ dependencies { // Testing-only dependencies //noinspection GradleDynamicVersion - androidTestCompile 'com.android.support:support-annotations:24.+' + + androidTestCompile 'com.android.support:support-annotations:24.2.1' androidTestCompile 'com.android.support.test:runner:0.4' androidTestCompile 'com.android.support.test:rules:0.4' androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1' From f3383662b26fde05da1e817d3d7bc9e06247bd14 Mon Sep 17 00:00:00 2001 From: Carlos Cepeda Date: Tue, 3 Sep 2019 11:22:31 -0500 Subject: [PATCH 7/7] Update build.gradle --- project/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/app/build.gradle b/project/app/build.gradle index 5566a371..d3abd376 100644 --- a/project/app/build.gradle +++ b/project/app/build.gradle @@ -56,7 +56,7 @@ repositories { } android { - compileSdkVersion 26 + compileSdkVersion 25 buildToolsVersion '25.0.0' lintOptions {