From 894249086b810a75428e70d62104a4aaa340a040 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <alex@mapswithme.com>
Date: Mon, 16 Jun 2014 23:04:27 -1000
Subject: [PATCH] [android] Fixed new gradle plugin errors

---
 android/build.gradle                             | 14 +++++++-------
 android/gradle/wrapper/gradle-wrapper.properties |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index dfcd1ec374..9d4a36b9f5 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.9.2'
+    classpath 'com.android.tools.build:gradle:0.11.+'
   }
 }
 
@@ -46,7 +46,7 @@ android {
   flavorDimensions 'store'
   productFlavors {
     pro {
-      packageName 'com.mapswithme.maps.pro'
+      applicationId 'com.mapswithme.maps.pro'
       buildConfigField 'String', 'PRO_URL', '""'      // Empty url string for the pro version
       android.sourceSets.pro.setRoot('flavors/pro')
       android.sourceSets.pro.assets.srcDirs = ['flavors/guides-assets']
@@ -54,7 +54,7 @@ android {
 
     // Pro version for Amazon doesn't include links to our travel guides
     proNoGuides {
-      packageName 'com.mapswithme.maps.pro'
+      applicationId 'com.mapswithme.maps.pro'
       buildConfigField 'String', 'PRO_URL', '""'      // Empty url string for the pro version
       android.sourceSets.proNoGuides.setRoot('flavors/pro')
     }
@@ -69,7 +69,7 @@ android {
     // Linked to the Pro version on Samsung Apps
     samsung {
       flavorDimension 'store'
-      packageName 'com.mapswithme.maps.samsung'      // Custom package name for Samsung Lite version - due to historical reasons
+      applicationId 'com.mapswithme.maps.samsung'      // Custom package name for Samsung Lite version - due to historical reasons
       buildConfigField 'String', 'PRO_URL', '"samsungapps://ProductDetail/com.mapswithme.maps.pro"'
       android.sourceSets.samsung.setRoot('flavors/lite')
       android.sourceSets.samsung.assets.srcDirs = ['flavors/guides-assets']
@@ -116,7 +116,7 @@ android {
     // This is an annoying hack to get around the fact that the Gradle plugin does not support
     // having libraries with different minSdkVersions. Play Services has a min version of 9 but we support 7 still
     variant.processManifest.doFirst {
-      File manifestFile = file("${buildDir}/exploded-aar/com.google.android.gms/play-services/4.4.52/AndroidManifest.xml")
+      File manifestFile = file("${buildDir}/intermediates/exploded-aar/com.google.android.gms/play-services/4.4.52/AndroidManifest.xml")
       if (manifestFile.exists()) {
         println("Replacing minSdkVersion in Google Play Services")
         String content = manifestFile.getText('UTF-8')
@@ -149,7 +149,7 @@ android {
 
   buildTypes {
     debug {
-      packageNameSuffix '.debug'   // Allows to install debug and release builds together
+      applicationIdSuffix '.debug'   // Allows to install debug and release builds together
       versionNameSuffix '-debug'
       jniDebugBuild true           // Enable jni debug build
       zipAlign true
@@ -160,7 +160,7 @@ android {
     }
 
     beta {
-      packageNameSuffix '.beta'
+      applicationIdSuffix '.beta'
       versionNameSuffix '-beta'
       signingConfig signingConfigs.mapswithme
     }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 06b73ae6f0..e37d7d1af7 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Apr 24 20:54:57 FET 2014
+#Mon Jun 16 22:45:43 HST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip