From 80b0578b739db399c0ae90eb39867ecaf4649219 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Wed, 13 Apr 2016 23:18:38 +0200
Subject: [PATCH] Updated dependencies.

---
 build.gradle                             | 16 +++++++++++-----
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index c22b5f65..11a90b47 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:2.0.0'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
         classpath 'com.github.triplet.gradle:play-publisher:1.1.4'
     }
@@ -20,10 +20,9 @@ repositories {
     mavenCentral()
     jcenter()
 }
-
 dependencies {
     compile 'eu.chainfire:libsuperuser:1.0.0.201602271131'
-    compile 'com.android.support:design:23.1.1'
+    compile 'com.android.support:design:23.3.0'
     compile 'com.google.zxing:android-integration:3.2.1'
     androidTestCompile 'com.squareup.okhttp:mockwebserver:2.4.0'
 }
@@ -34,8 +33,6 @@ android {
     compileSdkVersion 23
     buildToolsVersion "23.0.2"
 
-    useLibrary 'org.apache.http.legacy'
-
     defaultConfig {
         applicationId "com.nutomic.syncthingandroid"
         minSdkVersion 11
@@ -54,6 +51,15 @@ android {
         }
     }
 
+    // Without this parameter, all builds fail with error:
+    //     Execution failed for task ':mergeArmeabiDebugResources'.
+    //     > Some file crunching failed, see logs for details
+    // https://code.google.com/p/android/issues/detail?id=163378
+    aaptOptions.setProperty("cruncherEnabled", false)
+
+    // We haven't upgraded to the new HTTP library yet.
+    useLibrary 'org.apache.http.legacy'
+
     signingConfigs {
         release {
             if (System.getenv("key_alias")) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f6a775b4..5c720a28 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
-distributionSha256Sum=4647967f8de78d6d6d8093cdac50f368f8c2b8038f41a5afe1c3bce4c69219a9
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
+distributionSha256Sum=d8b1948a575dc9ec13e03db94502ce91815d73da023f611296c04b852164cb5f