diff --git a/build.gradle b/build.gradle index 6e29944a..6873f91c 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,7 @@ buildscript { ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2] repositories { + maven { url 'https://maven.fabric.io/public' } maven { url 'https://maven.google.com' } jcenter() google() @@ -41,6 +42,7 @@ buildscript { classpath 'com.android.tools.build:gradle:3.4.1' classpath 'com.google.gms:google-services:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'io.fabric.tools:gradle:1.29.0' classpath "io.realm:realm-gradle-plugin:$realm_version" } } @@ -50,6 +52,7 @@ allprojects { google() jcenter() maven { url "https://jitpack.io" } + maven { url 'https://maven.fabric.io/public' } maven { url 'https://maven.google.com' } maven { name 'glide-snapshot' diff --git a/presentation/build.gradle b/presentation/build.gradle index b3bf8ce1..5372ac9a 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -179,7 +179,6 @@ dependencies { implementation "com.bugsnag:bugsnag-android:4.1.1" implementation "com.github.chrisbanes:PhotoView:2.0.0" implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version" - implementation 'com.google.firebase:firebase-core:16.0.9' implementation "com.google.android:flexbox:0.3.1" implementation "com.jakewharton.timber:timber:$timber_version" implementation "com.squareup.moshi:moshi:$moshi_version" @@ -189,10 +188,17 @@ dependencies { implementation project(":common") implementation project(':data') implementation project(':domain') + + withAnalyticsImplementation 'com.google.firebase:firebase-core:16.0.9' + withAnalyticsImplementation 'com.crashlytics.sdk.android:crashlytics:2.10.1' + noAnalyticsDebug project(path: ':data', configuration: 'noAnalyticsDebug') noAnalyticsRelease project(path: ':data', configuration: 'noAnalyticsRelease') withAnalyticsDebug project(path: ':data', configuration: 'withAnalyticsDebug') withAnalyticsRelease project(path: ':data', configuration: 'withAnalyticsRelease') } -apply plugin: 'com.google.gms.google-services' +if (getGradle().getStartParameter().getTaskRequests().toString().contains("WithAnalytics")) { + apply plugin: 'io.fabric' + apply plugin: 'com.google.gms.google-services' +} diff --git a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt index e6a2bdb7..4c1b8256 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt @@ -31,6 +31,7 @@ import com.bugsnag.android.Configuration import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.R import com.moez.QKSMS.common.util.BugsnagTree +import com.moez.QKSMS.common.util.CrashlyticsTree import com.moez.QKSMS.common.util.FileLoggingTree import com.moez.QKSMS.injection.AppComponentManager import com.moez.QKSMS.injection.appComponent @@ -71,8 +72,6 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn projectPackages = packages }) - RxJava2Debug.enableRxJava2AssemblyTracking() - Realm.init(this) Realm.setDefaultConfiguration(RealmConfiguration.Builder() .compactOnLaunch() @@ -97,7 +96,9 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn EmojiCompat.init(FontRequestEmojiCompatConfig(this, fontRequest)) - Timber.plant(Timber.DebugTree(), BugsnagTree(), fileLoggingTree) + Timber.plant(Timber.DebugTree(), BugsnagTree(), CrashlyticsTree(), fileLoggingTree) + + RxJava2Debug.enableRxJava2AssemblyTracking(arrayOf("com.moez.QKSMS")) } override fun activityInjector(): AndroidInjector { diff --git a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt b/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt new file mode 100644 index 00000000..4b897e3d --- /dev/null +++ b/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package com.moez.QKSMS.common.util + +import timber.log.Timber +import javax.inject.Inject + +class CrashlyticsTree : Timber.Tree() { + + override fun log(priority: Int, tag: String?, message: String?, throwable: Throwable?) { + // Do nothing for noAnalytics build flavor + } + +} diff --git a/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt b/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt new file mode 100644 index 00000000..5dcec368 --- /dev/null +++ b/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package com.moez.QKSMS.common.util + +import com.crashlytics.android.Crashlytics +import timber.log.Timber + +class CrashlyticsTree : Timber.Tree() { + + override fun log(priority: Int, tag: String?, message: String?, throwable: Throwable?) { + Crashlytics.log(message) + + throwable?.run(Crashlytics::logException) + } + +} diff --git a/secrets.tar.enc b/secrets.tar.enc index 124887a3..35ec7e2a 100644 Binary files a/secrets.tar.enc and b/secrets.tar.enc differ