From 94e1f5d571d98d8da55cce730a98977c5b130961 Mon Sep 17 00:00:00 2001
From: John Carlson <carlson@ludomade.com>
Date: Wed, 27 May 2015 13:38:12 -0500
Subject: [PATCH] Update project so that it runs with the latest versions of
 gradle, Android Studio, targets SDK 22, and has the newest support libs
 (which happens to fix incorrect navigation drawer icon)

---
 app/build.gradle                         | 20 ++++++++++----------
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c1db2b9..d54bebd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,26 +1,26 @@
 import com.android.build.gradle.tasks.PackageApplication
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 apply from: 'signing.gradle'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion '21.1.1'
+    compileSdkVersion 22
+    buildToolsVersion '21.1.2'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 21
+        targetSdkVersion 22
         versionCode 37
         versionName "1.6.0"
     }
     buildTypes {
         release {
             signingConfig signingConfigs.release
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             debuggable false
-            jniDebugBuild false
-            zipAlign true
+            jniDebuggable false
+            zipAlignEnabled true
         }
     }
     packagingOptions {
@@ -40,8 +40,8 @@ dependencies {
     compile 'com.jakewharton:butterknife:5.1.2'
     compile 'de.keyboardsurfer.android.widget:crouton:1.8.5@aar'
     compile 'com.melnykov:floatingactionbutton:1.0.4'
-    compile 'com.android.support:support-v4:21.0.0'
-    compile 'com.android.support:appcompat-v7:21.0.0'
+    compile 'com.android.support:support-v4:22.1.1'
+    compile 'com.android.support:appcompat-v7:22.1.1'
     compile fileTree(dir: 'libs', include: ['*.jar'])
 }
 
@@ -50,7 +50,7 @@ task copyNativeLibs(type: Copy) {
     into new File(buildDir, 'native-libs')
 }
 
-tasks.withType(Compile) { compileTask -> compileTask.dependsOn copyNativeLibs }
+tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn copyNativeLibs }
 
 clean.dependsOn 'cleanCopyNativeLibs'
 
diff --git a/build.gradle b/build.gradle
index e33f142..1e7b1f8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
+        classpath 'com.android.tools.build:gradle:1.2.3'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 853c179..e596d19 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip