From f55138353ccebdf12d2d01674a4e800a8e1119a3 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Mon, 11 May 2015 16:28:03 +0200
Subject: [PATCH] Google Play Services library update

---
 android-app-tests/android-app-tests.iml | 34 +++++++++++++------------
 android-app/android-app.iml             | 10 +++++---
 android-app/build.gradle                |  5 ++--
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/android-app-tests/android-app-tests.iml b/android-app-tests/android-app-tests.iml
index ef5b97dd..9cb1add8 100644
--- a/android-app-tests/android-app-tests.iml
+++ b/android-app-tests/android-app-tests.iml
@@ -75,38 +75,40 @@
     <orderEntry type="library" exported="" scope="TEST" name="nekohtml-1.9.6.2" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="support-annotations-22.1.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="simple-xml-2.6.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_com_android_support_recyclerview_v7_21_0_0_jars_classes_jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="support-annotations-22.1.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_com_android_support_support_v4_22_1_1_jars_classes_jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_core_build_libs_core_jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="core" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="commons-cli-1.2" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="annotations-2.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_com_google_android_gms_play_services_ads_6_5_87_jars_classes_jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_com_melnykov_floatingactionbutton_1_1_0_jars_classes_jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_org_solovyev_android_android_common_menus_1_1_18_jars_classes_jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="internal_impl-22.1.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="stax-1.2.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_com_google_android_gms_play_services_analytics_7_3_0_jars_classes_jar" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="leakcanary-watcher-1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_com_squareup_leakcanary_leakcanary_android_1_3_jars_classes_jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_org_solovyev_android_android_common_other_1_1_18_jars_classes_jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="common-msg-1.0.5" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="common-listeners-1.0.7" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_org_solovyev_android_android_common_preferences_1_1_18_jars_classes_jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="guava-11.0.2" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_org_solovyev_android_checkout_0_7_2_jars_classes_jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="library-2.4.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="common-text-1.0.7" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_org_solovyev_android_material_0_1_2_jars_classes_jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="acra-4.5.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_org_solovyev_android_android_common_views_1_1_18_jars_classes_jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_com_google_android_gms_play_services_base_6_5_87_jars_classes_jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="common-core-1.0.7" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_org_solovyev_android_android_common_core_1_1_18_jars_classes_jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="haha-1.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="common-security-1.0.7" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="jscl-1.0.11" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="leakcanary-analyzer-1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_org_solovyev_android_android_common_lists_1_1_18_jars_classes_jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_exploded_aar_com_android_support_appcompat_v7_22_1_1_jars_classes_jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_classes_debug" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_dependency_cache_debug" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="android" level="project" />
diff --git a/android-app/android-app.iml b/android-app/android-app.iml
index c936564c..1287315c 100644
--- a/android-app/android-app.iml
+++ b/android-app/android-app.iml
@@ -72,8 +72,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/21.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.1.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/6.5.87/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/6.5.87/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/7.3.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/7.3.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.3.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.melnykov/floatingactionbutton/1.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.squareup.leakcanary/leakcanary-android/1.3/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.solovyev.android/android-common-core/1.1.18/jars" />
@@ -102,9 +103,9 @@
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="leakcanary-watcher-1.3" level="project" />
-    <orderEntry type="library" exported="" name="play-services-ads-6.5.87" level="project" />
     <orderEntry type="library" exported="" name="acra-4.5.0" level="project" />
     <orderEntry type="library" exported="" name="annotations-2.0.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-ads-7.3.0" level="project" />
     <orderEntry type="library" exported="" name="common-core-1.0.7" level="project" />
     <orderEntry type="library" exported="" name="common-listeners-1.0.7" level="project" />
     <orderEntry type="library" exported="" name="common-text-1.0.7" level="project" />
@@ -113,12 +114,13 @@
     <orderEntry type="library" exported="" name="jscl-1.0.11" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="leakcanary-analyzer-1.3" level="project" />
+    <orderEntry type="library" exported="" name="play-services-base-7.3.0" level="project" />
     <orderEntry type="library" exported="" name="material-0.1.2" level="project" />
     <orderEntry type="library" exported="" name="android-common-menus-1.1.18" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-21.0.0" level="project" />
     <orderEntry type="library" exported="" name="leakcanary-android-1.3" level="project" />
     <orderEntry type="library" exported="" name="common-security-1.0.7" level="project" />
-    <orderEntry type="library" exported="" name="play-services-base-6.5.87" level="project" />
+    <orderEntry type="library" exported="" name="play-services-analytics-7.3.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
     <orderEntry type="library" exported="" name="haha-1.1" level="project" />
     <orderEntry type="library" exported="" name="android-common-core-1.1.18" level="project" />
diff --git a/android-app/build.gradle b/android-app/build.gradle
index 6c9ad467..4df999c9 100644
--- a/android-app/build.gradle
+++ b/android-app/build.gradle
@@ -72,8 +72,9 @@ dependencies {
     }
     compile 'org.solovyev.android:checkout:0.7.2@aar'
     compile 'org.solovyev.android:material:0.1.2@aar'
-    compile 'com.google.android.gms:play-services-ads:6.5.87@aar'
-    compile 'com.google.android.gms:play-services-base:6.5.87@aar'
+    compile 'com.google.android.gms:play-services-ads:7.3.0@aar'
+    compile 'com.google.android.gms:play-services-base:7.3.0@aar'
+    compile 'com.google.android.gms:play-services-analytics:7.3.0@aar'
     compile 'com.melnykov:floatingactionbutton:1.1.0'
 
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3'