From 4b1a4928b57ec7b713c75ea327feb09982e8d388 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Mon, 4 Sep 2017 10:48:49 +0200
Subject: [PATCH 1/2] =?UTF-8?q?Do=20not=20(travis)=20fail=20if=20android?=
 =?UTF-8?q?=20build=20is=20longer=20that=2010=C2=A0minutes.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 77eac45..6769429 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ before_install:
 - chmod 600 travis/travisci_builder_id_key
 cache: ccache
 install: travis/install_extra_deps.sh
-script: travis/compile_all.sh
+script: travis_wait 30 travis/compile_all.sh
 deploy:
   provider: script
   skip_cleanup: true

From a0c29d19df12930540f03eb81ed6da1a455036bc Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Mon, 4 Sep 2017 10:49:37 +0200
Subject: [PATCH 2/2] Enable build cache for gradle.

This should reduce build time.
---
 .travis.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6769429..c42b01a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,15 @@ before_install:
 - openssl aes-256-cbc -K $encrypted_eba2f7543984_key -iv $encrypted_eba2f7543984_iv
   -in travis/travisci_builder_id_key.enc -out travis/travisci_builder_id_key -d
 - chmod 600 travis/travisci_builder_id_key
-cache: ccache
+before_cache:
+  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  ccache: true
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache
 install: travis/install_extra_deps.sh
 script: travis_wait 30 travis/compile_all.sh
 deploy: