Skip to content
This repository has been archived by the owner on Oct 7, 2024. It is now read-only.

Commit

Permalink
Update firebase (#1387)
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin Li authored Oct 16, 2020
1 parent af74f3e commit 0ad2c54
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 14 deletions.
3 changes: 2 additions & 1 deletion MapboxAndroidDemo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'com.github.triplet.play'
apply plugin: 'io.fabric'
apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'org.jmailen.kotlinter'
apply from: "$project.rootDir/gradle/script-git-version.gradle"
apply from: "$project.rootDir/gradle/gradle-dependencies-graph.gradle"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.mapbox.mapboxandroiddemo;

import com.crashlytics.android.Crashlytics;
import com.google.firebase.FirebaseApp;
import com.mapbox.mapboxandroiddemo.utils.TileLoadingInterceptor;
import com.mapbox.mapboxsdk.Mapbox;
Expand All @@ -9,7 +8,6 @@
import com.squareup.picasso.Picasso;

import androidx.multidex.MultiDexApplication;
import io.fabric.sdk.android.Fabric;
import okhttp3.OkHttpClient;

public class MapboxApplication extends MultiDexApplication {
Expand All @@ -20,7 +18,6 @@ public void onCreate() {
setUpPicasso();
if (!BuildConfig.DEBUG) {
FirebaseApp.initializeApp(this);
setUpCrashlytics();
}
Mapbox.getInstance(this, getString(R.string.access_token));
if (BuildConfig.DEBUG) {
Expand All @@ -47,8 +44,4 @@ private void setUpTileLoadingMeasurement() {
.build();
HttpRequestUtil.setOkHttpClient(okHttpClient);
}

private void setUpCrashlytics() {
Fabric.with(this, new Crashlytics());
}
}
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ buildscript {
repositories {
google()
jcenter()
maven { url 'https://maven.fabric.io/public' }
maven { url 'https://plugins.gradle.org/m2/' }
}

Expand Down
10 changes: 5 additions & 5 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ ext {
androidXAnnotation : '1.1.0',
androidXMaterialDesign : '1.1.0-alpha07',
androidXConstraintLayout : '1.1.3',
firebaseCore : '17.0.0',
firebaseCore : '17.5.1',
firebasePerf : '18.0.1',
firebaseCrashlytics : '2.10.1',
firebaseCrashlytics : '17.2.2',
firebaseMessaging : '19.0.1',
firebaseRemoteConfig : '18.0.0',

Expand Down Expand Up @@ -69,7 +69,7 @@ ext {
kotlin : '1.3.41',
dependencyGraph : '0.3.0',
grgit : '2.3.0',
fabric : '1.29.0',
fabric : '2.3.0',
kotlinLint : '1.26.0',
googleServices : '4.3.0',
]
Expand Down Expand Up @@ -114,7 +114,7 @@ ext {
// Firebase
firebasePerf : "com.google.firebase:firebase-perf:${version.firebasePerf}",
firebaseCore : "com.google.firebase:firebase-core:${version.firebaseCore}",
firebaseCrashlytics : "com.crashlytics.sdk.android:crashlytics:${version.firebaseCrashlytics}",
firebaseCrashlytics : "com.google.firebase:firebase-crashlytics:${version.firebaseCrashlytics}",
firebaseMessaging : "com.google.firebase:firebase-messaging:${version.firebaseMessaging}",
firebaseRemoteConfig : "com.google.firebase:firebase-config:${version.firebaseRemoteConfig}",

Expand Down Expand Up @@ -144,7 +144,7 @@ ext {
kotlin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${pluginVersion.kotlin}",
dependencyGraph : "com.vanniktech:gradle-dependency-graph-generator-plugin:${pluginVersion.dependencyGraph}",
grgit : "org.ajoberstar:grgit:${pluginVersion.grgit}",
fabric : "io.fabric.tools:gradle:${pluginVersion.fabric}",
fabric : "com.google.firebase:firebase-crashlytics-gradle:${pluginVersion.fabric}",
googleServices : "com.google.gms:google-services:${pluginVersion.googleServices}",
kotlinLint : "org.jmailen.gradle:kotlinter-gradle:${pluginVersion.kotlinLint}"
]
Expand Down

0 comments on commit 0ad2c54

Please sign in to comment.