From 63e337b2c8f5dcb125cce8d4b793b7e1e5c1e8fe Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Tue, 18 Sep 2018 08:45:21 +0200
Subject: [PATCH 1/2] Adds Travis CI to build and run local tests

---
 .travis.yml                                   | 21 +++++++++++++++++++
 .../ServiceTestRuleSample/app/build.gradle    |  2 +-
 test_all.sh                                   |  2 +-
 ui/espresso/WebBasicSample/app/build.gradle   |  6 +++---
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..00eefcb82
--- /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-26
+    - 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/integration/ServiceTestRuleSample/app/build.gradle b/integration/ServiceTestRuleSample/app/build.gradle
index 9b48ac35d..c2dd291d5 100644
--- a/integration/ServiceTestRuleSample/app/build.gradle
+++ b/integration/ServiceTestRuleSample/app/build.gradle
@@ -6,7 +6,7 @@ android {
     defaultConfig {
         applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample"
         minSdkVersion 14
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
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
diff --git a/ui/espresso/WebBasicSample/app/build.gradle b/ui/espresso/WebBasicSample/app/build.gradle
index 4627be17d..c41172e3f 100644
--- a/ui/espresso/WebBasicSample/app/build.gradle
+++ b/ui/espresso/WebBasicSample/app/build.gradle
@@ -18,14 +18,14 @@ android {
     productFlavors {
     }
     packagingOptions {
-      exclude 'META-INF/maven/com.google.guava/guava/pom.properties'
-      exclude 'META-INF/maven/com.google.guava/guava/pom.xml'
+        exclude 'META-INF/maven/com.google.guava/guava/pom.properties'
+        exclude 'META-INF/maven/com.google.guava/guava/pom.xml'
     }
 }
 
 dependencies {
     // App dependencies
-    implementation 'androidx.annotation:annotation:'+ rootProject.androidxLibVersion;
+    implementation 'androidx.annotation:annotation:' + rootProject.androidxLibVersion;
     implementation 'com.google.guava:guava:' + rootProject.guavaVersion
     // Testing-only dependencies
     androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion;

From d43778c6f5c415de06342bdd290fa4b6ade2dd64 Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Tue, 18 Sep 2018 08:21:26 +0200
Subject: [PATCH 2/2] make travis work

---
 .travis.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 00eefcb82..9cbbb34e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,13 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-25.0.0
-    - android-26
+    - build-tools-28.0.2
+    - android-28
     - extra-android-m2repository
+  licenses:
+    - android-sdk-preview-license-.+
+    - android-sdk-license-.+
+    - google-gdk-license-.+
 jdk:
   - oraclejdk8
 script: