From 1f8330fd06e49963c20ab1045f13a357382c2867 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 28 Apr 2017 13:15:27 +1000
Subject: [PATCH 1/3] use gradle android plugin v2.2.2

Starting with v2.2.2, it zeroes out timestamps in the APK's ZIP header
https://android-developers.googleblog.com/2016/11/understanding-apk-packaging-in-android-studio-2-2.html

This version is also the version that is included in Debian/stretch.
---
 build.gradle                                      | 3 ++-
 extern/support-v4-preferencefragment/build.gradle | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9653f5be2..749954481 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        // 2.2.2 is the version that is included in Debian/stretch
+        classpath 'com.android.tools.build:gradle:2.2.2'
         classpath files('libs/gradle-witness.jar')
     }
 }
diff --git a/extern/support-v4-preferencefragment/build.gradle b/extern/support-v4-preferencefragment/build.gradle
index 59bd0dc11..e677e406f 100644
--- a/extern/support-v4-preferencefragment/build.gradle
+++ b/extern/support-v4-preferencefragment/build.gradle
@@ -4,7 +4,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.10.+'
+        // 2.2.2 is the version that is included in Debian/stretch
+        classpath 'com.android.tools.build:gradle:2.2.2'
     }
 }
 

From c7d92359517fdebf912cb9e6f59c806bf02e3ff8 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 28 Apr 2017 12:29:54 +0200
Subject: [PATCH 2/3] update gradle to 3.2.1, the version included in
 Debian/stretch

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 501e1c448..73aaa14be 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
-distributionSha256Sum=c7de3442432253525902f7e8d7eac8b5fd6ce1623f96d76916af6d0e383010fc
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
+distributionSha256Sum=9843a3654d3e57dce54db06d05f18b664b95c22bf90c6becccb61fc63ce60689

From c7e4a0f3df5670bbd4f6ddf4bc1295875bc21d32 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 1 May 2017 11:54:22 +0200
Subject: [PATCH 3/3] gitlab-ci: provide debug info for connected24 failures

connected24 tests are frequently failing saying that while an emulator
is running, its not compatible.  This is bizarre. This just adds debug
output to help troubleshoot that.
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23798b563..0c3174062 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,9 +56,11 @@ connected24:
     AVD_SDK: "24"
   script:
     - ./gradlew assembleDebug -PdisablePreDex
+    - android list avd
     - emulator64-arm -avd fcl-test-$AVD_SDK -no-audio -no-window &
     - ./tools/wait-for-emulator
     - adb shell input keyevent 82 &
+    - adb devices
     - export EXITVALUE=0
     - ./gradlew connectedCheck -PdisablePreDex || {
         adb -e logcat -d '*:E';