Google Play Services libraries are added separately now

This commit is contained in:
serso 2015-01-27 23:23:59 +01:00
parent d4a89d97ae
commit b51a78567f
4 changed files with 35 additions and 35 deletions

View File

@ -83,8 +83,8 @@
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="play-services-6.5.87" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.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="common-core-1.0.7" level="project" />
@ -98,6 +98,7 @@
<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="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="android-common-core-1.1.18" level="project" />
<orderEntry type="library" exported="" name="checkout-0.6.0" level="project" />
<orderEntry type="library" exported="" name="common-msg-1.0.5" level="project" />

View File

@ -70,7 +70,8 @@ dependencies {
exclude(module: 'xercesImpl')
}
compile 'org.solovyev.android:checkout:0.6.0@aar'
compile 'com.google.android.gms:play-services:6.5.87@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.melnykov:floatingactionbutton:1.1.0'
}
@ -100,6 +101,28 @@ signing {
sign configurations.archives
}
gradle.taskGraph.afterTask { Task task ->
if (task.project.name == 'android-app') {
if (task.name == 'mergeReleaseResources') {
cleanGoogleServicesResources('release')
} else if (task.name == 'mergeDebugResources') {
cleanGoogleServicesResources('debug')
}
}
}
private void cleanGoogleServicesResources(buildType) {
ant.delete(includeEmptyDirs: 'true') {
fileset(dir: file('./build/intermediates/res/' + buildType), includes: '**/common_signin*')
}
ant.delete(includeEmptyDirs: 'true') {
fileset(dir: file('./build/intermediates/res/' + buildType), includes: '**/ic_plusone*')
}
ant.delete(includeEmptyDirs: 'true') {
fileset(dir: file('./build/intermediates/res/' + buildType), includes: '**/powered_by_google*')
}
}
group = "org.solovyev.android"
archivesBaseName = "calculatorpp-android-app"
version = version_name()

View File

@ -65,28 +65,16 @@
-dontwarn com.google.ads.**
-dontwarn com.sun.org.apache.xerces.internal.impl.dv.util.Base64
-dontwarn com.actionbarsherlock.BuildConfig
-dontwarn com.google.android.gms.**
-dontwarn com.melnykov.fab.**
-dontwarn android.support.v7.**
-keep class android.support.v7.** { *; }
-keep interface android.support.v7.** { *; }
-dontwarn com.google.android.gms.internal.*
-keep class org.simpleframework.xml.** { *; }
-keep class * implements org.solovyev.android.calculator.model.MathPersistenceEntity
-keep class * implements org.solovyev.android.calculator.MathEntityPersistenceContainer
#
#*********************************************************************
#
# SHERLOCK
#
#*********************************************************************
#
-keep class android.support.v4.app.** { *; }
-keep interface android.support.v4.app.** { *; }
-keep class com.actionbarsherlock.** { *; }
-keep interface com.actionbarsherlock.** { *; }
-keep class android.support.v7.** { *; }
-keep interface android.support.v7.** { *; }
#

View File

@ -64,16 +64,17 @@
-dontwarn com.google.ads.**
-dontwarn com.sun.org.apache.xerces.internal.impl.dv.util.Base64
-dontwarn com.actionbarsherlock.BuildConfig
-dontwarn com.google.android.gms.**
-dontwarn com.melnykov.fab.**
-dontwarn android.support.v7.**
-keep class android.support.v7.** { *; }
-keep interface android.support.v7.** { *; }
-dontwarn com.google.android.gms.internal.*
-keep class org.simpleframework.xml.** { *; }
-keep class * implements org.solovyev.android.calculator.model.MathPersistenceEntity
-keep class * implements org.solovyev.android.calculator.MathEntityPersistenceContainer
-keep class android.support.v4.app.** { *; }
-keep interface android.support.v4.app.** { *; }
-keep class android.support.v7.** { *; }
-keep interface android.support.v7.** { *; }
#
#*********************************************************************
#
@ -90,19 +91,6 @@
public static int e(...);
}
#
#*********************************************************************
#
# SHERLOCK
#
#*********************************************************************
#
-keep class android.support.v4.app.** { *; }
-keep interface android.support.v4.app.** { *; }
-keep class com.actionbarsherlock.** { *; }
-keep interface com.actionbarsherlock.** { *; }
#
#*********************************************************************
#