From 8f93d7cba0e21fd3887565166be4cd048382cde4 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Thu, 23 Mar 2017 12:10:52 +0100 Subject: [PATCH] Switched back to Crashlytics/Fabric --- app/build.gradle | 12 +- app/google-services.json | 107 ------------------ .../java/com/kabouzeid/gramophone/App.java | 16 +++ build.gradle | 1 - 4 files changed, 27 insertions(+), 109 deletions(-) delete mode 100644 app/google-services.json diff --git a/app/build.gradle b/app/build.gradle index c9e45d57..cde3b8f2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,18 +1,22 @@ buildscript { repositories { + maven { url 'https://maven.fabric.io/public' } mavenCentral() } dependencies { + //noinspection GradleDynamicVersion + classpath 'io.fabric.tools:gradle:1.+' classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1' } } apply plugin: 'com.android.application' +apply plugin: 'io.fabric' apply plugin: 'com.jakewharton.hugo' -apply plugin: 'com.google.gms.google-services' repositories { + maven { url 'https://maven.fabric.io/public' } maven { url "https://jitpack.io" } } @@ -39,6 +43,8 @@ android { debug { applicationIdSuffix '.debug' versionNameSuffix ' DEBUG' + + ext.enableCrashlytics = false // Disable fabric build ID generation for debug builds } } packagingOptions { @@ -56,6 +62,10 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' + compile('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') { + transitive = true + } + compile('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.4@aar') { transitive = true } diff --git a/app/google-services.json b/app/google-services.json deleted file mode 100644 index f5d748fa..00000000 --- a/app/google-services.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "project_info": { - "project_number": "", - "firebase_url": "", - "project_id": "", - "storage_bucket": "" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "", - "android_client_info": { - "package_name": "com.kabouzeid.gramophone" - } - }, - "oauth_client": [ - { - "client_id": "", - "client_type": 1, - "android_info": { - "package_name": "com.kabouzeid.gramophone", - "certificate_hash": "" - } - }, - { - "client_id": "", - "client_type": 1, - "android_info": { - "package_name": "com.kabouzeid.gramophone", - "certificate_hash": "" - } - }, - { - "client_id": "", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "", - "client_type": 3 - } - ] - }, - "ads_service": { - "status": 2 - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "", - "android_client_info": { - "package_name": "com.kabouzeid.gramophone.debug" - } - }, - "oauth_client": [ - { - "client_id": "", - "client_type": 1, - "android_info": { - "package_name": "com.kabouzeid.gramophone.debug", - "certificate_hash": "" - } - }, - { - "client_id": "", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "", - "client_type": 3 - } - ] - }, - "ads_service": { - "status": 2 - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file diff --git a/app/src/main/java/com/kabouzeid/gramophone/App.java b/app/src/main/java/com/kabouzeid/gramophone/App.java index 9279f222..a9104638 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/App.java +++ b/app/src/main/java/com/kabouzeid/gramophone/App.java @@ -2,9 +2,25 @@ package com.kabouzeid.gramophone; import android.app.Application; +import com.crashlytics.android.Crashlytics; +import com.crashlytics.android.core.CrashlyticsCore; + +import io.fabric.sdk.android.Fabric; + /** * @author Karim Abou Zeid (kabouzeid) */ public class App extends Application { public static final String GOOGLE_PLAY_LICENSE_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjMeADN5Ffnt/ml5SYxNPCn8kGcOYGpHEfNSCts99vVxqmCn6C01E94c17j7rUK2aeHur5uxphZylzopPlQ8P8l1fqty0GPUNRSo18FCJzfGH8HZAwZYOcnRFPaXdaq3InyFJhBiODh2oeAcVK/idH6QraQ4r9HIlzigAg6lgwzxl2wJKDh7X/GMdDntCyzDh8xDQ0wIawFgvgojHwqh2Ci8Gnq6EYRwPA9yHiIIksT8Q30QyM5ewl5QcnWepsls7enNqeHarhpmSibRUDgCsxHoOpny7SyuvZvUI3wuLckDR0ds9hrt614scHHqDOBp/qWCZiAgOPVAEQcURbV09qQIDAQAB"; + + @Override + public void onCreate() { + super.onCreate(); + + // Set up Crashlytics, disabled for debug builds + Crashlytics crashlyticsKit = new Crashlytics.Builder() + .core(new CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build()) + .build(); + Fabric.with(this, crashlyticsKit); + } } diff --git a/build.gradle b/build.gradle index b5de8bd0..4a1d32e3 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,6 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:2.3.0' - classpath 'com.google.gms:google-services:3.0.0' } }