From daeb3b51fdec650f5d26565dd84cd570d6d9c426 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Sat, 6 Dec 2014 12:55:42 +1100
Subject: [PATCH] Upgrade to Android Studio 1.0 RC4

---
 android/java/app/build.gradle                         | 2 +-
 android/java/build.gradle                             | 2 +-
 android/java/gradle/wrapper/gradle-wrapper.properties | 4 ++--
 android/java/lib/build.gradle                         | 5 ++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/android/java/app/build.gradle b/android/java/app/build.gradle
index e579f37e7..17084ad15 100644
--- a/android/java/app/build.gradle
+++ b/android/java/app/build.gradle
@@ -26,7 +26,7 @@ android {
 
     buildTypes {
         release {
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
diff --git a/android/java/build.gradle b/android/java/build.gradle
index e1e165302..d72847912 100644
--- a/android/java/build.gradle
+++ b/android/java/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.13.2'
+        classpath 'com.android.tools.build:gradle:1.0.0-rc4'
     }
 }
 
diff --git a/android/java/gradle/wrapper/gradle-wrapper.properties b/android/java/gradle/wrapper/gradle-wrapper.properties
index ffaa281a4..5adf98860 100644
--- a/android/java/gradle/wrapper/gradle-wrapper.properties
+++ b/android/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Sat Dec 06 12:43:10 EST 2014
 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
diff --git a/android/java/lib/build.gradle b/android/java/lib/build.gradle
index 0b86b715e..14749095b 100644
--- a/android/java/lib/build.gradle
+++ b/android/java/lib/build.gradle
@@ -5,7 +5,6 @@ android {
     buildToolsVersion "21.1.1"
 
     defaultConfig {
-        applicationId "com.mapbox.mapboxgl.lib"
         minSdkVersion 14
         targetSdkVersion 21
         versionCode 2
@@ -19,11 +18,11 @@ android {
 
     buildTypes {
         debug {
-            jniDebugBuild true
+            jniDebuggable true
         }
 
         release {
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }