From b35dde9f01ef0f17611f591ee604f25bb444d747 Mon Sep 17 00:00:00 2001 From: diegolmello Date: Fri, 2 Aug 2019 18:19:26 -0300 Subject: [PATCH] Firebase --- android/app/build.gradle | 6 +++--- android/app/build_defs.bzl | 19 +++++++++++++++++++ .../rocket/reactnative/MainApplication.java | 4 ++-- android/build.gradle | 4 ++-- android/settings.gradle | 2 -- react-native.config.js | 5 ----- 6 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 android/app/build_defs.bzl diff --git a/android/app/build.gradle b/android/app/build.gradle index 971d50c44..0fec5451e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -203,14 +203,14 @@ android { dependencies { addUnimodulesDependencies() implementation project(':reactnativenotifications') - implementation project(':react-native-firebase') + // implementation project(':react-native-firebase') implementation project(":reactnativekeyboardinput") implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "com.facebook.react:react-native:+" // From node_modules implementation "com.google.firebase:firebase-messaging:18.0.0" implementation "com.google.firebase:firebase-core:16.0.9" - implementation "com.google.firebase:firebase-perf:16.2.5" - implementation('com.crashlytics.sdk.android:crashlytics:2.9.5@aar') { + implementation "com.google.firebase:firebase-perf:17.0.2" + implementation('com.crashlytics.sdk.android:crashlytics:2.9.9@aar') { transitive = true } diff --git a/android/app/build_defs.bzl b/android/app/build_defs.bzl new file mode 100644 index 000000000..fff270f8d --- /dev/null +++ b/android/app/build_defs.bzl @@ -0,0 +1,19 @@ +"""Helper definitions to glob .aar and .jar targets""" + +def create_aar_targets(aarfiles): + for aarfile in aarfiles: + name = "aars__" + aarfile[aarfile.rindex("/") + 1:aarfile.rindex(".aar")] + lib_deps.append(":" + name) + android_prebuilt_aar( + name = name, + aar = aarfile, + ) + +def create_jar_targets(jarfiles): + for jarfile in jarfiles: + name = "jars__" + jarfile[jarfile.rindex("/") + 1:jarfile.rindex(".jar")] + lib_deps.append(":" + name) + prebuilt_jar( + name = name, + binary_jar = jarfile, + ) diff --git a/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java b/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java index 4b9ac755e..db002d248 100644 --- a/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java +++ b/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java @@ -27,7 +27,7 @@ import com.wix.reactnativenotifications.core.notification.INotificationsApplicat import com.wix.reactnativenotifications.core.notification.IPushNotification; import com.wix.reactnativekeyboardinput.KeyboardInputPackage; -import io.invertase.firebase.RNFirebasePackage; +// import io.invertase.firebase.RNFirebasePackage; import io.invertase.firebase.fabric.crashlytics.RNFirebaseCrashlyticsPackage; import io.invertase.firebase.analytics.RNFirebaseAnalyticsPackage; import io.invertase.firebase.perf.RNFirebasePerformancePackage; @@ -49,7 +49,7 @@ public class MainApplication extends Application implements ReactApplication, IN protected List getPackages() { @SuppressWarnings("UnnecessaryLocalVariable") List packages = new PackageList(this).getPackages(); - packages.add(new RNFirebasePackage()); + // packages.add(new RNFirebasePackage()); packages.add(new RNFirebaseCrashlyticsPackage()); packages.add(new RNFirebaseAnalyticsPackage()); packages.add(new RNFirebasePerformancePackage()); diff --git a/android/build.gradle b/android/build.gradle index 0bd72d124..857ebc59a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.4.1' classpath 'com.google.gms:google-services:4.2.0' - classpath 'io.fabric.tools:gradle:1.25.4' - classpath 'com.google.firebase:firebase-plugins:1.1.5' + classpath 'io.fabric.tools:gradle:1.28.1' + classpath 'com.google.firebase:perf-plugin:1.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/android/settings.gradle b/android/settings.gradle index 7ca955987..91acd30d4 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -4,8 +4,6 @@ includeUnimodulesProjects() rootProject.name = 'RocketChatRN' include ':reactnativenotifications' project(':reactnativenotifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android') -include ':react-native-firebase' -project(':react-native-firebase').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-firebase/android') include ':reactnativekeyboardinput' project(':reactnativekeyboardinput').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keyboard-input/lib/android') apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) diff --git a/react-native.config.js b/react-native.config.js index 9ef62f420..34ae4ec44 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -10,11 +10,6 @@ module.exports = { android: null } }, - 'react-native-firebase': { - platforms: { - android: null - } - }, 'react-native-keyboard-input': { platforms: { android: null