diff --git a/app/build.gradle b/app/build.gradle
index 70720595eaa0e25ebbcb4067b8e3315698257143..2f87f3aaad9122bcb159d9da268268b65b575ed6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ android {
     buildTypes {
         release {
             signingConfig signingConfigs.release
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
diff --git a/build.gradle b/build.gradle
index 68d0388c0d100b0100fbc149be8b03794c30ce1e..5262a560dd3efd420683b04a0360940c332cd703 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.13.3'
+        classpath 'com.android.tools.build:gradle:1.0.0'
         classpath files('gradle/libs/gradle-witness.jar')
     }
 }
diff --git a/client/build.gradle b/client/build.gradle
index 82844defdd7abe7fcaa46ceaec83aa76c3f82da8..920810d80abb49c0bd9ec1250fb20991bb52fc5e 100644
--- a/client/build.gradle
+++ b/client/build.gradle
@@ -11,7 +11,7 @@ android {
     }
     buildTypes {
         release {
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
@@ -41,7 +41,7 @@ android.libraryVariants.all { variant ->
     }
 
     // Hook the copy task into the build
-    variant.packageLibrary.dependsOn copyClientLibsTask
+    variant.processJavaResources.dependsOn copyClientLibsTask
     copyClientLibsTask.mustRunAfter ':routerjars:buildClient'
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 27d8b1a659b3ae0c136d4c834e27e9d60d6803cb..0bffd23c3323d4ae05bf11bd26594d6b2e6417d0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip