diff --git a/android/app/build.gradle b/android/app/build.gradle index 531d1e8af..6f8c567b6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' // Crashlytics integration is done as part of Firebase now, so it gets // automagically activated with google-services.json if (googleServicesEnabled) { - apply plugin: 'io.fabric' + apply plugin: 'com.google.firebase.crashlytics' } // Use the number of seconds/10 since Jan 1 2019 as the versionCode. @@ -70,10 +70,6 @@ android { } } -repositories { - maven { url 'https://maven.fabric.io/public' } -} - dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.legacy:legacy-support-v4:1.0.0' @@ -87,9 +83,8 @@ dependencies { // Firebase // - Crashlytics // - Dynamic Links - implementation 'com.google.firebase:firebase-core:16.0.6' - implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8' - implementation 'com.google.firebase:firebase-dynamic-links:16.1.5' + implementation 'com.google.firebase:firebase-crashlytics:17.2.1' + implementation 'com.google.firebase:firebase-dynamic-links:19.1.0' } implementation project(':sdk') diff --git a/android/app/src/main/java/org/jitsi/meet/GoogleServicesHelper.java b/android/app/src/main/java/org/jitsi/meet/GoogleServicesHelper.java index 16932c24c..db73aa3ca 100644 --- a/android/app/src/main/java/org/jitsi/meet/GoogleServicesHelper.java +++ b/android/app/src/main/java/org/jitsi/meet/GoogleServicesHelper.java @@ -3,9 +3,8 @@ package org.jitsi.meet; import android.net.Uri; import android.util.Log; -import com.crashlytics.android.Crashlytics; +import com.google.firebase.crashlytics.FirebaseCrashlytics; import com.google.firebase.dynamiclinks.FirebaseDynamicLinks; -import io.fabric.sdk.android.Fabric; import org.jitsi.meet.sdk.JitsiMeet; import org.jitsi.meet.sdk.JitsiMeetActivity; @@ -22,10 +21,7 @@ final class GoogleServicesHelper { if (BuildConfig.GOOGLE_SERVICES_ENABLED) { Log.d(activity.getClass().getSimpleName(), "Initializing Google Services"); - if (!JitsiMeet.isCrashReportingDisabled(activity)) { - Fabric.with(activity, new Crashlytics()); - } - + FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(!JitsiMeet.isCrashReportingDisabled(activity)); FirebaseDynamicLinks.getInstance().getDynamicLink(activity.getIntent()) .addOnSuccessListener(activity, pendingDynamicLinkData -> { Uri dynamicLink = null; diff --git a/android/build.gradle b/android/build.gradle index 755d99612..72890deb5 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,17 +7,11 @@ buildscript { repositories { google() jcenter() - repositories { - maven { url 'https://maven.fabric.io/public' } - } } dependencies { classpath 'com.android.tools.build:gradle:3.3.2' classpath 'com.google.gms:google-services:4.3.3' - classpath 'io.fabric.tools:gradle:1.28.1' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files. + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0' } }