From 7f3a3de6e7377f2c0f01542dc98814686e8d6af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= Date: Wed, 12 Jul 2017 15:39:15 +0200 Subject: [PATCH 1/3] Adds Travis CI to build and run local tests --- .travis.yml | 21 +++++++++++++++++++++ test_all.sh | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..77a646e5d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,21 @@ +# Only build and run local tests (no UI tests are executed) + +language: android +android: + components: + - tools + - platform-tools + - build-tools-25.0.0 + - android-25 + - extra-android-m2repository +jdk: + - oraclejdk8 +script: + - ./test_all.sh test +before_cache: + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock +cache: + directories: + - $HOME/.m2 + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ diff --git a/test_all.sh b/test_all.sh index 2bdd740b2..49f6df739 100755 --- a/test_all.sh +++ b/test_all.sh @@ -9,7 +9,7 @@ for p in $(cat projects.conf); do echo "=====================================================================" pushd $p > /dev/null # Silent pushd - ./gradlew $@ test cAT | sed "s@^@$p @" # Prefix every line with directory + ./gradlew $@ | sed "s@^@$p @" # Prefix every line with directory code=${PIPESTATUS[0]} if [ "$code" -ne "0" ]; then exit $code From 030d1fc427dbd7db80880a157cad0d441b418e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= Date: Wed, 12 Jul 2017 16:03:44 +0200 Subject: [PATCH 2/3] Bumps sdk to 25 and downgrades uiautomator to 2.1.2 --- integration/ServiceTestRuleSample/app/build.gradle | 4 ++-- runner/AndroidJunitRunnerSample/app/build.gradle | 4 ++-- ui/espresso/BasicSample/app/build.gradle | 4 ++-- ui/espresso/CustomMatcherSample/app/build.gradle | 4 ++-- ui/espresso/DataAdapterSample/app/build.gradle | 4 ++-- ui/espresso/IdlingResourceSample/app/build.gradle | 4 ++-- ui/espresso/IntentsAdvancedSample/app/build.gradle | 4 ++-- ui/espresso/IntentsBasicSample/app/build.gradle | 4 ++-- ui/espresso/MultiWindowSample/app/build.gradle | 4 ++-- ui/espresso/RecyclerViewSample/app/build.gradle | 4 ++-- ui/espresso/WebBasicSample/app/build.gradle | 4 ++-- ui/uiautomator/BasicSample/app/build.gradle | 4 ++-- ui/uiautomator/BasicSample/build.gradle | 4 ++-- unit/BasicSample/app/build.gradle | 4 ++-- unit/BasicUnitAndroidTest/app/build.gradle | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/integration/ServiceTestRuleSample/app/build.gradle b/integration/ServiceTestRuleSample/app/build.gradle index b04463c42..aeaf8600a 100644 --- a/integration/ServiceTestRuleSample/app/build.gradle +++ b/integration/ServiceTestRuleSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 + compileSdkVersion 25 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample" minSdkVersion 10 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 1 versionName "1.0" diff --git a/runner/AndroidJunitRunnerSample/app/build.gradle b/runner/AndroidJunitRunnerSample/app/build.gradle index 6a30def79..c91944938 100644 --- a/runner/AndroidJunitRunnerSample/app/build.gradle +++ b/runner/AndroidJunitRunnerSample/app/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 + compileSdkVersion 25 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.androidjunitrunnersample" minSdkVersion 8 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 1 versionName "1.0" diff --git a/ui/espresso/BasicSample/app/build.gradle b/ui/espresso/BasicSample/app/build.gradle index 8fbc7c88e..15c0671da 100644 --- a/ui/espresso/BasicSample/app/build.gradle +++ b/ui/espresso/BasicSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 + compileSdkVersion 25 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.BasicSample" minSdkVersion 10 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 1 versionName "1.0" diff --git a/ui/espresso/CustomMatcherSample/app/build.gradle b/ui/espresso/CustomMatcherSample/app/build.gradle index 11e71ca0a..ff694753e 100644 --- a/ui/espresso/CustomMatcherSample/app/build.gradle +++ b/ui/espresso/CustomMatcherSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 + compileSdkVersion 25 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.CustomMatcherSample" minSdkVersion 10 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 1 versionName "1.0" diff --git a/ui/espresso/DataAdapterSample/app/build.gradle b/ui/espresso/DataAdapterSample/app/build.gradle index ee692a4f2..14886f795 100644 --- a/ui/espresso/DataAdapterSample/app/build.gradle +++ b/ui/espresso/DataAdapterSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 + compileSdkVersion 25 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.DataAdapterSample" minSdkVersion 10 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/ui/espresso/IdlingResourceSample/app/build.gradle b/ui/espresso/IdlingResourceSample/app/build.gradle index f5dced658..974aab3cd 100644 --- a/ui/espresso/IdlingResourceSample/app/build.gradle +++ b/ui/espresso/IdlingResourceSample/app/build.gradle @@ -17,13 +17,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 + compileSdkVersion 25 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.IdlingResourceSample" minSdkVersion 10 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 1 versionName "1.0" diff --git a/ui/espresso/IntentsAdvancedSample/app/build.gradle b/ui/espresso/IntentsAdvancedSample/app/build.gradle index 6293b1f59..c83078f69 100644 --- a/ui/espresso/IntentsAdvancedSample/app/build.gradle +++ b/ui/espresso/IntentsAdvancedSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 + compileSdkVersion 25 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.intents.AdvancedSample" minSdkVersion 10 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 1 versionName "1.0" diff --git a/ui/espresso/IntentsBasicSample/app/build.gradle b/ui/espresso/IntentsBasicSample/app/build.gradle index 809308de5..c745e549d 100644 --- a/ui/espresso/IntentsBasicSample/app/build.gradle +++ b/ui/espresso/IntentsBasicSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 + compileSdkVersion 25 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.BasicSample" minSdkVersion 10 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 1 versionName "1.0" diff --git a/ui/espresso/MultiWindowSample/app/build.gradle b/ui/espresso/MultiWindowSample/app/build.gradle index 4729c5d5d..1cd860ccf 100644 --- a/ui/espresso/MultiWindowSample/app/build.gradle +++ b/ui/espresso/MultiWindowSample/app/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 + compileSdkVersion 25 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.MultiWindowSample" minSdkVersion 10 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/ui/espresso/RecyclerViewSample/app/build.gradle b/ui/espresso/RecyclerViewSample/app/build.gradle index 214befde0..c4ef3ddbf 100644 --- a/ui/espresso/RecyclerViewSample/app/build.gradle +++ b/ui/espresso/RecyclerViewSample/app/build.gradle @@ -17,12 +17,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 + compileSdkVersion 25 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.RecyclerViewSample" minSdkVersion 10 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 1 versionName "1.0" diff --git a/ui/espresso/WebBasicSample/app/build.gradle b/ui/espresso/WebBasicSample/app/build.gradle index 3e1adf793..39658b4ab 100644 --- a/ui/espresso/WebBasicSample/app/build.gradle +++ b/ui/espresso/WebBasicSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 + compileSdkVersion 25 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.espresso.web.BasicSample" minSdkVersion 10 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 1 versionName "1.0" diff --git a/ui/uiautomator/BasicSample/app/build.gradle b/ui/uiautomator/BasicSample/app/build.gradle index 67606c72f..e5c28f609 100644 --- a/ui/uiautomator/BasicSample/app/build.gradle +++ b/ui/uiautomator/BasicSample/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 + compileSdkVersion 25 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.uiautomator.BasicSample" minSdkVersion 18 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 1 versionName "1.0" diff --git a/ui/uiautomator/BasicSample/build.gradle b/ui/uiautomator/BasicSample/build.gradle index ce477ea64..e37cadcaf 100644 --- a/ui/uiautomator/BasicSample/build.gradle +++ b/ui/uiautomator/BasicSample/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.2' + classpath 'com.android.tools.build:gradle:2.3.3' } } @@ -21,5 +21,5 @@ ext { runnerVersion = "0.5" rulesVersion = "0.5" espressoVersion = "2.2.2" - uiautomatorVersion = "2.3.2" + uiautomatorVersion = "2.1.2" } diff --git a/unit/BasicSample/app/build.gradle b/unit/BasicSample/app/build.gradle index ccc3fe81b..f8fbf24b7 100644 --- a/unit/BasicSample/app/build.gradle +++ b/unit/BasicSample/app/build.gradle @@ -17,14 +17,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 + compileSdkVersion 25 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.unittesting.BasicSample" minSdkVersion 8 versionCode 1 versionName "1.0" - targetSdkVersion 24 + targetSdkVersion 25 } productFlavors { } diff --git a/unit/BasicUnitAndroidTest/app/build.gradle b/unit/BasicUnitAndroidTest/app/build.gradle index 5dd61fe59..34f12d295 100644 --- a/unit/BasicUnitAndroidTest/app/build.gradle +++ b/unit/BasicUnitAndroidTest/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 + compileSdkVersion 25 buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "com.example.android.testing.unittesting.basicunitandroidtest" minSdkVersion 10 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" From abc7e548a8bfc94ecbc33b96a28d27069d5972bb Mon Sep 17 00:00:00 2001 From: Jose Alerreca Date: Fri, 28 Jul 2017 14:46:47 +0100 Subject: [PATCH 3/3] Fixes Travis config after bump to api 26 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 77a646e5d..00eefcb82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ android: - tools - platform-tools - build-tools-25.0.0 - - android-25 + - android-26 - extra-android-m2repository jdk: - oraclejdk8