From 0479c62edcf6094d3e9dd2530b2ae50c7c036212 Mon Sep 17 00:00:00 2001
From: Dmitry Yunitsky <yunik@mapswithme.com>
Date: Fri, 20 Mar 2015 21:22:22 +0300
Subject: [PATCH] Changed repository according to google advices, updated GMS &
 build tools.

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

diff --git a/android/build.gradle b/android/build.gradle
index e6284865de..c19bc08796 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
   repositories {
-    mavenCentral()
+    jcenter()
   }
 
   dependencies {
@@ -10,15 +10,19 @@ buildscript {
 
 allprojects {
   repositories {
-    mavenCentral()
+    jcenter()
   }
 }
 
 apply plugin: 'com.android.application'
 
-
 dependencies {
-  compile libSupportV4, libSupportV7, libGooglePlayServicesLocation, libGooglePlayServicesPlus, libNineOldAndroids, libFacebookSdk
+  // android support libs
+  compile libSupportV4, libSupportV7
+  // google play services
+  compile libGmsLocation, libGmsPlus, libGmsAnalytics
+  // 3-party
+  compile libNineOldAndroids, libFacebookSdk
   compile fileTree(dir: '3rd_party', include: '*.jar', exclude: 'mrgsmanifest.jar')
 }
 
diff --git a/android/gradle.properties b/android/gradle.properties
index aeaa840f7d..b6b478daff 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,16 +1,19 @@
 propMinSdkVersion=9
 propTargetSdkVersion=22
-propBuildToolsVersion=22
+propBuildToolsVersion=22.0.1
 propVersionCode=422
 propVersionName=4.2.2
 propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1
 propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1
+
 libSupportV4=com.android.support:support-v4:22.+
 libSupportV7=com.android.support:appcompat-v7:22.+
-libGooglePlayServicesLocation=com.google.android.gms:play-services-location:6.5.+
-libGooglePlayServicesPlus=com.google.android.gms:play-services-plus:6.5.+
+libGmsLocation=com.google.android.gms:play-services-location:7.0.0
+libGmsPlus=com.google.android.gms:play-services-plus:7.0.0
+libGmsAnalytics=com.google.android.gms:play-services-analytics:7.0.0
 libGradleAndroidPlugin=com.android.tools.build:gradle:1.0.+
 libNineOldAndroids=com.nineoldandroids:library:2.4.0
 libFacebookSdk=com.facebook.android:facebook-android-sdk:3.+
+
 propStatisticsUrl="http://localhost:8080/2"
 propStatisticsDevelopmentUrl="http://localhost:8080/dev"