From d34b033384f97a85ab5964a2a050b2327acd969b Mon Sep 17 00:00:00 2001
From: Niko Strijbol <strijbol.niko@gmail.com>
Date: Thu, 19 Sep 2019 16:30:19 +0200
Subject: [PATCH] Attempt to fix Travis

---
 .travis.yml      | 10 +++++-----
 app/build.gradle |  7 +++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d552f5e01..48ae72cf7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: android
 jdk:
   - oraclejdk8
+sudo: false
 
 android:
   components:
@@ -13,15 +14,13 @@ env:
   - FLAVOUR=testRelease
 
 script:
-  - "./gradlew clean $FLAVOUR"
+  - "./gradlew clean $FLAVOUR --console=plain"
 
 notifications:
   email: false
 
-sudo: false
-
-before_install:
-  - yes | sdkmanager "platforms;android-28"
+#before_install:
+#  - yes | sdkmanager "platforms;android-28"
 
 # Caching according to the docs at https://docs.travis-ci.com/user/languages/java/#Projects-Using-Gradle
 before_cache:
@@ -31,6 +30,7 @@ cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache
 
 # We only build on these branches and on release tags, which are tagged r[0-9]+.
 branches:
diff --git a/app/build.gradle b/app/build.gradle
index 550a2444f..07c656f22 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -200,3 +200,10 @@ def loadProperties() {
 
     return actualKeys
 }
+
+// Travis uses plain console mode, which does not output test status by default, causing time-outs.
+tasks.withType(Test) {
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+}