From 63c9f4358007bf99c06079218eefda719d591678 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Wed, 22 Mar 2017 19:59:37 +0100 Subject: [PATCH] Updated libraries and switched from Crashlytics to Firebase --- .gitignore | 3 +-- app/build.gradle | 25 ++++++------------- .../java/com/kabouzeid/gramophone/App.java | 18 ------------- build.gradle | 2 +- 4 files changed, 9 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 75a6eea2..04388588 100644 --- a/.gitignore +++ b/.gitignore @@ -41,5 +41,4 @@ captures/ # Mac .DS_Store -# Private Keys -/privatekeys \ No newline at end of file +/app/google-services.json \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 82d291e4..c77a9ef3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,23 +1,18 @@ 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.github.triplet.play' +apply plugin: 'com.google.gms.google-services' repositories { - maven { url 'https://maven.fabric.io/public' } maven { url "https://jitpack.io" } } @@ -44,8 +39,6 @@ android { debug { applicationIdSuffix '.debug' versionNameSuffix ' DEBUG' - - ext.enableCrashlytics = false // Disable fabric build ID generation for debug builds } } packagingOptions { @@ -63,15 +56,11 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') { + compile('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.4@aar') { transitive = true } - compile('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.0@aar') { - transitive = true - } - - compile('com.github.kabouzeid:app-theme-helper:1.3.4') { + compile('com.github.kabouzeid:app-theme-helper:1.3.5') { transitive = true } @@ -92,8 +81,8 @@ dependencies { compile 'com.android.support:preference-v7:25.3.0' compile 'com.android.support:preference-v14:25.3.0' - compile 'com.afollestad.material-dialogs:core:0.9.3.0@aar' - compile 'com.afollestad.material-dialogs:commons:0.9.3.0@aar' + compile 'com.afollestad.material-dialogs:core:0.9.4.2@aar' + compile 'com.afollestad.material-dialogs:commons:0.9.4.2@aar' compile 'com.afollestad:material-cab:0.1.12@aar' compile 'com.github.ksoichiro:android-observablescrollview:1.6.0' @@ -111,6 +100,6 @@ dependencies { compile 'me.zhanghai.android.materialprogressbar:library:1.3.0' compile 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5' - compile 'com.jakewharton:butterknife:8.4.0' - annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' + compile 'com.jakewharton:butterknife:8.5.1' + annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1' } diff --git a/app/src/main/java/com/kabouzeid/gramophone/App.java b/app/src/main/java/com/kabouzeid/gramophone/App.java index 761ab9a2..9279f222 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/App.java +++ b/app/src/main/java/com/kabouzeid/gramophone/App.java @@ -2,27 +2,9 @@ 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 TAG = App.class.getSimpleName(); - 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 efb2ec82..b5de8bd0 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:2.3.0' - classpath 'com.github.triplet.gradle:play-publisher:1.1.5' + classpath 'com.google.gms:google-services:3.0.0' } }