diff --git a/QKSMS/build.gradle b/QKSMS/build.gradle index d5737bef..b8e37404 100644 --- a/QKSMS/build.gradle +++ b/QKSMS/build.gradle @@ -1,9 +1,11 @@ apply plugin: 'com.android.application' apply plugin: 'me.tatarka.retrolambda' +apply plugin: 'io.fabric' repositories { mavenCentral() jcenter() + maven { url 'https://maven.fabric.io/public' } } android { @@ -32,6 +34,7 @@ android { versionName "2.2.5" minSdkVersion 15 targetSdkVersion 22 + multiDexEnabled true } buildTypes { @@ -40,6 +43,11 @@ android { shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'qksms-proguard.pro' } + debug { + minifyEnabled true + shrinkResources true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'qksms-proguard.pro' + } } compileOptions { @@ -63,10 +71,12 @@ android { buildscript { repositories { mavenCentral() + maven { url 'https://maven.fabric.io/public' } } dependencies { classpath 'me.tatarka:gradle-retrolambda:3.2.2' + classpath 'io.fabric.tools:gradle:1.21.2' } } @@ -85,15 +95,19 @@ dependencies { compile 'com.vdurmont:emoji-java:1.1.1' compile 'me.leolin:ShortcutBadger:1.1.1' compile 'com.googlecode.ez-vcard:ez-vcard:0.9.6' - compile 'com.google.code.gson:gson:2.3' + compile 'com.google.code.gson:gson:2.4' compile 'com.koushikdutta.ion:ion:1.1.7' compile 'org.ligi:snackengage:0.4' // Google libraries + compile 'com.android.support:multidex:1.0.1' compile 'com.android.support:appcompat-v7:22.2.1' compile 'com.android.support:support-v13:22.2.1' compile 'com.android.support:recyclerview-v7:22.2.1' - withAnalyticsCompile 'com.google.android.gms:play-services-analytics:7.5.0' + withAnalyticsCompile 'com.google.android.gms:play-services-analytics:8.3.0' + // External services - withAnalyticsCompile 'com.crittercism:crittercism-android-agent:5.0.3' + withAnalyticsCompile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { + transitive = true; + } } diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index a315488a..c926e8d6 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -486,6 +486,10 @@ + + diff --git a/QKSMS/src/main/java/com/moez/QKSMS/QKSMSAppBase.java b/QKSMS/src/main/java/com/moez/QKSMS/QKSMSAppBase.java index 126d5aa2..fe6a4f8e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/QKSMSAppBase.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/QKSMSAppBase.java @@ -18,7 +18,6 @@ package com.moez.QKSMS; import android.annotation.SuppressLint; -import android.app.Application; import android.content.Context; import android.content.res.Configuration; import android.drm.DrmManagerClient; @@ -26,6 +25,7 @@ import android.location.Country; import android.os.StrictMode; import android.preference.PreferenceManager; import android.provider.SearchRecentSuggestions; +import android.support.multidex.MultiDexApplication; import android.telephony.TelephonyManager; import android.util.Log; import com.android.mms.transaction.MmsSystemEventReceiver; @@ -47,7 +47,7 @@ import com.squareup.leakcanary.RefWatcher; import java.util.Locale; -public class QKSMSAppBase extends Application { +public class QKSMSAppBase extends MultiDexApplication { public static final String LOG_TAG = "Mms"; private SearchRecentSuggestions mRecentSuggestions; diff --git a/QKSMS/src/main/res/values/keys.xml b/QKSMS/src/main/res/values/keys.xml deleted file mode 100644 index a337fc54..00000000 --- a/QKSMS/src/main/res/values/keys.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 0 - \ No newline at end of file diff --git a/QKSMS/src/withAnalytics/java/com/moez/QKSMS/QKSMSApp.java b/QKSMS/src/withAnalytics/java/com/moez/QKSMS/QKSMSApp.java index 77703830..ca463f9e 100644 --- a/QKSMS/src/withAnalytics/java/com/moez/QKSMS/QKSMSApp.java +++ b/QKSMS/src/withAnalytics/java/com/moez/QKSMS/QKSMSApp.java @@ -1,11 +1,12 @@ package com.moez.QKSMS; -import com.crittercism.app.Crittercism; +import com.crashlytics.android.Crashlytics; +import io.fabric.sdk.android.Fabric; public class QKSMSApp extends QKSMSAppBase { @Override public void onCreate() { super.onCreate(); - Crittercism.initialize(getApplicationContext(), getString(R.string.crtsm_key)); + Fabric.with(this, new Crashlytics()); } }