From 6a38e180578286ce0221a9f5eadb36862f68879a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 29 Mar 2016 17:45:11 +0100
Subject: [PATCH 1/5] Android.mk: Fix apk path

It's app-release-unsigned.apk, not F-Droid-release-unsigned.apk. To make
sure we don't screw up again, just use $(fdroid_dir).
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 3c1b8bd50..c6110a340 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,7 +10,7 @@ fdroid_root  := $(LOCAL_PATH)
 fdroid_dir   := app
 fdroid_out   := $(PWD)/$(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates
 fdroid_build := $(fdroid_root)/$(fdroid_dir)/build
-fdroid_apk   := build/outputs/apk/F-Droid-release-unsigned.apk
+fdroid_apk   := build/outputs/apk/$(fdroid_dir)-release-unsigned.apk
 
 $(fdroid_root)/$(fdroid_dir)/$(fdroid_apk):
 	rm -Rf $(fdroid_build)

From db2aaeaf223a4f48260d27bffd55ab59d8d66e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 29 Mar 2016 17:46:27 +0100
Subject: [PATCH 2/5] Bump checkstyle to 6.17

No changes were necessary to keep it happy.
---
 Privileged-Extension/build.gradle | 2 +-
 app/build.gradle                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Privileged-Extension/build.gradle b/Privileged-Extension/build.gradle
index 7bf259315..086188004 100644
--- a/Privileged-Extension/build.gradle
+++ b/Privileged-Extension/build.gradle
@@ -36,7 +36,7 @@ android {
 }
 
 checkstyle {
-    toolVersion = '6.16'
+    toolVersion = '6.17'
 }
 
 task checkstyle(type: Checkstyle) {
diff --git a/app/build.gradle b/app/build.gradle
index 04108e0da..49a7d01ba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -181,7 +181,7 @@ android {
 }
 
 checkstyle {
-    toolVersion = '6.16'
+    toolVersion = '6.17'
 }
 
 task checkstyle(type: Checkstyle) {

From 3a83f80ab68877bf72e9a4ffe50655730264b70a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 29 Mar 2016 17:48:43 +0100
Subject: [PATCH 3/5] CI: Use the new client image

It's now made up of one extra layer. No changes in practice other than
android-23 being updated to rev2.
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cebdae9e2..3f64efe6c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: mvdan/fdroid-ci:20160316
+image: mvdan/fdroid-ci:client-20160329
 
 cache:
   paths:

From d5456e1bbf969e0f2a9bcdb7a6185e9a724b1ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 29 Mar 2016 17:54:24 +0100
Subject: [PATCH 4/5] Bump ACRA to 4.8.5

Minor bugfix release.
---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 49a7d01ba..6722e61ab 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     compile 'commons-io:commons-io:2.4'
     compile 'commons-net:commons-net:3.4'
     compile 'org.openhab.jmdns:jmdns:3.4.2'
-    compile('ch.acra:acra:4.8.2') {
+    compile('ch.acra:acra:4.8.5') {
         exclude module: 'support-v4'
         exclude module: 'support-annotations'
     }
@@ -80,7 +80,7 @@ if (!hasProperty('sourceDeps')) {
             'com.madgag.spongycastle:pkix:6aba9b2210907a3d46dd3dcac782bb3424185290468d102d5207ebdc9796a905',
             'com.madgag.spongycastle:prov:029f26cd6b67c06ffa05702d426d472c141789001bcb15b7262ed86c868e5643',
             'com.madgag.spongycastle:core:9b6b7ac856b91bcda2ede694eccd26cefb0bf0b09b89f13cda05b5da5ff68c6b',
-            'ch.acra:acra:bc12400f7fe0c86d238c0daa269bff2b785e5403d601d6874622d87e8be64771',
+            'ch.acra:acra:afd5b28934d5166b55f261c85685ad59e8a4ebe9ca1960906afaa8c76d8dc9eb',
             'io.reactivex:rxjava:2c162afd78eba217cdfee78b60e85d3bfb667db61e12bc95e3cf2ddc5beeadf6',
             'io.reactivex:rxandroid:35c1a90f8c1f499db3c1f3d608e1f191ac8afddb10c02dd91ef04c03a0a4bcda',
         ]

From 58c23c0a0e780f987b3361e21ee2ee56a52d7c0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 29 Mar 2016 17:57:21 +0100
Subject: [PATCH 5/5] Fix binaryDeps with new app folder

Little remaining breakage in our main build.gradle. Went unnoticed
because we rarely use this. And hopefully we can get rid of it soon.
---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6722e61ab..9dc0b5cc2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -98,10 +98,10 @@ if (!hasProperty('sourceDeps')) {
         compile project(':extern:zipsigner')
     }
 
-    task binaryDeps(type: Copy, dependsOn: ':F-Droid:prepareReleaseDependencies') {
+    task binaryDeps(type: Copy, dependsOn: ':app:prepareReleaseDependencies') {
 
         enabled = project.hasProperty('sourceDeps')
-        description = "Copies .jar and .aar files from subproject dependencies in extern/ to F-Droid/libs. Requires the sourceDeps property to be set (\"gradle -PsourceDeps binaryDeps\")"
+        description = "Copies .jar and .aar files from subproject dependencies in extern/ to app/libs. Requires the sourceDeps property to be set (\"gradle -PsourceDeps binaryDeps\")"
 
         from('../extern/') {
             include 'support-v4-preferencefragment/build/outputs/aar/support-v4-preferencefragment-release.aar'