From 3ee11e0bfb69ebcea4448882df695dee81ff33b7 Mon Sep 17 00:00:00 2001 From: Vlad Mihalachi Date: Sat, 14 Mar 2015 13:21:11 +0100 Subject: [PATCH] Updated support library --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 8 ++++---- libraries/sharedCode/build.gradle | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1f58456..c4331c6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -71,7 +71,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: '*.jar') compile project(':libraries:sharedCode') - compile 'com.google.android.gms:play-services-ads:6.5.+' + //compile 'com.google.android.gms:play-services-ads:6.5.+' compile('com.crashlytics.sdk.android:crashlytics:2.+@aar') { transitive = true; } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 53f483c..43f4755 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,8 +48,8 @@ - + - + diff --git a/libraries/sharedCode/build.gradle b/libraries/sharedCode/build.gradle index 7982fc1..62c2594 100644 --- a/libraries/sharedCode/build.gradle +++ b/libraries/sharedCode/build.gradle @@ -64,10 +64,10 @@ dependencies { // compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3' compile 'org.apache.commons:commons-lang3:3.1' compile files('libs/juniversalchardet-1.0.3.jar') - compile('com.android.support:appcompat-v7:21.+') { + compile('com.android.support:appcompat-v7:22.+') { exclude group: 'com.android.support', module: 'support-v4' } - compile 'com.android.support:support-v4:21.+' + compile 'com.android.support:support-v4:22.+' compile 'com.github.gabrielemariotti.changeloglib:library:1.5.1' compile 'commons-io:commons-io:2.4' compile 'com.android.support:support-annotations:20.0.0'