pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Exclude com.google.android.gms group from facebook audience network artifact.

Browse source 
Remove multidex.
This commit is contained in:
Roman Romanov 2017-02-10 15:01:38 +04:00
parent f5b711e09a
commit 2af91106f1
2 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
android/build.gradle
View file

@ -38,7 +38,6 @@ dependencies {
compile 'com.android.support:cardview-v7:22.2.1'
// google play services
compile 'com.google.android.gms:play-services-location:8.4.0'
compile 'com.google.android.gms:play-services-ads:8.4.0'
compile 'com.google.android.gms:play-services-analytics:8.4.0'
compile 'com.google.android.gms:play-services-plus:8.4.0'
compile 'com.google.android.gms:play-services-gcm:8.4.0'
@ -49,7 +48,9 @@ dependencies {
compile('com.crashlytics.sdk.android:crashlytics-ndk:1.1.2@aar') { transitive = true }
// 3-party
compile 'com.facebook.android:facebook-android-sdk:4.8.0'
compile 'com.facebook.android:audience-network-sdk:4.8.0'
compile('com.facebook.android:audience-network-sdk:4.8.0') {
exclude group: 'com.google.android.gms'
}
compile 'com.google.code.gson:gson:2.6.1'
compile 'com.pushwoosh:pushwoosh:4.10.7'
compile 'com.my.tracker:mytracker-sdk:1.3.5'
@ -64,9 +65,6 @@ dependencies {
compile 'com.github.bumptech.glide:glide:3.7.0'
// Java concurrency annotations
compile 'net.jcip:jcip-annotations:1.0'
//MultiDex
compile 'com.android.support:multidex:1.0.1'
}
def getDate() {
@ -112,9 +110,6 @@ android {
manifestPlaceholders += ['PW_APPID': pwProps['pwAppId']]
buildConfigField 'String', 'PW_APPID', /"${pwProps['pwAppId']}"/
manifestPlaceholders += ['PW_PROJECT_ID': pwProps['pwProjectId']]
//MultiDex
multiDexEnabled true
}
sourceSets.main {

9
android/src/com/mapswithme/maps/MwmApplication.java
View file

@ -1,7 +1,6 @@
package com.mapswithme.maps;
import android.app.Application;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Environment;
@ -10,7 +9,6 @@ import android.os.Message;
import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import android.support.annotation.UiThread;
import android.support.multidex.MultiDex;
import android.text.TextUtils;
import android.util.Log;
@ -169,13 +167,6 @@ public class MwmApplication extends Application
Editor.init();
}
@Override
protected void attachBaseContext(Context base)
{
super.attachBaseContext(base);
MultiDex.install(this);
}
public void initNativeCore()
{
if (mIsFrameworkInitialized)