@react-native-firebase/app 13.1.0 → 14.1.0

package/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [14.1.0](https://github.com/invertase/react-native-firebase/compare/v14.0.1...v14.1.0) (2021-12-18)
+
+### Bug Fixes
+
+- **app, android:** firebase-android-sdk 29.0.3 to fix underlying NPE in 29.0.2 ([#5946](https://github.com/invertase/react-native-firebase/issues/5946)) ([051f4a6](https://github.com/invertase/react-native-firebase/commit/051f4a66d64db42f1c615580e185eaf00660fbc1))
+
+### Features
+
+- **analytics, config:** expose automatic screenview reporting toggle ([#5948](https://github.com/invertase/react-native-firebase/issues/5948)) ([8836c01](https://github.com/invertase/react-native-firebase/commit/8836c01dcfa2f478f973a1a54253509c3368d963))
+
+## [14.0.1](https://github.com/invertase/react-native-firebase/compare/v14.0.0...v14.0.1) (2021-12-15)
+
+### Bug Fixes
+
+- **app, expo:** Update AppDelegate config plugin for Expo SDK 44 ([#5940](https://github.com/invertase/react-native-firebase/issues/5940)) ([185756d](https://github.com/invertase/react-native-firebase/commit/185756df6de238aa8a018007cf6b2fa810cb6055))
+
+# [14.0.0](https://github.com/invertase/react-native-firebase/compare/v13.1.1...v14.0.0) (2021-12-14)
+
+**Note:** Version bump only for package @react-native-firebase/app
+
+## [13.1.1](https://github.com/invertase/react-native-firebase/compare/v13.1.0...v13.1.1) (2021-12-14)
+
+### Bug Fixes
+
+- **deps:** AGP7.0.4, firebase-android-sdk 29.0.2, javascript deps ([55d0a36](https://github.com/invertase/react-native-firebase/commit/55d0a36a0addc54e347f26bb8ee88bb38b0fa4a6))
+
 # [13.1.0](https://github.com/invertase/react-native-firebase/compare/v13.0.1...v13.1.0) (2021-12-02)
 
 ### Features

package/android/build.gradle

@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.3")
+      classpath("com.android.tools.build:gradle:7.0.4")
     }
   }
 }

package/android/src/reactnative/java/io/invertase/firebase/app/ReactNativeFirebaseVersion.java

@@ -18,5 +18,5 @@ package io.invertase.firebase.app;
  */
 // generated file - do not modify or commit
 public class ReactNativeFirebaseVersion {
-  public static String VERSION = "13.1.0";
+  public static String VERSION = "14.1.0";
 }

package/firebase-schema.json

@@ -25,6 +25,10 @@
           "description": "If you wish to disable collection of SSAID (Settings.Secure.ANDROID_ID) in your Android app,.\n This cannot be altered at runtime once set in the config.",
           "type": "boolean"
         },
+        "google_analytics_automatic_screen_reporting_enabled": {
+          "description": "If you wish to disable automatic screen reporting in your app.\n This cannot be altered at runtime once set in the config.",
+          "type": "boolean"
+        },
         "analytics_default_allow_ad_personalization_signals": {
           "description": "Configure whether a user's Analytics data may be used for personalized advertising in other products.\n If set, may be overridden at runtime by calling setUserProperty on the key 'allow_personalized_ads'",
           "type": "boolean"
@@ -54,7 +58,7 @@
           "type": "boolean"
         },
         "crashlytics_javascript_exception_handler_chaining_enabled": {
-          "description": "By default React Native Firebase Crashlytics will preserve existing global javascript-level uhandled exception handlers by reporting to Crashlytics then passing the exception on for further handling. This could lead to duplicate reports, for example a fatal javascript-level report and a fatal native level report for the same crash. Set to false to terminate error handling after logging the javascript-level crash.",
+          "description": "By default React Native Firebase Crashlytics will preserve existing global javascript-level unhandled exception handlers by reporting to Crashlytics then passing the exception on for further handling. This could lead to duplicate reports, for example a fatal javascript-level report and a fatal native level report for the same crash. Set to false to terminate error handling after logging the javascript-level crash.",
           "type": "boolean"
         },
         "crashlytics_ndk_enabled": {

package/ios/RNFBApp/RNFBVersion.m

@@ -18,4 +18,4 @@
 #import "RCTVersion.h"
 
 // generated file - do not modify or commit
-NSString* const RNFBVersionString = @"13.1.0";
+NSString* const RNFBVersionString = @"14.1.0";

package/ios_config.sh

@@ -126,6 +126,14 @@ if [[ ${_SEARCH_RESULT} ]]; then
     _PLIST_ENTRY_VALUES+=("$(jsonBoolToYesNo "$_ANALYTICS_PERSONALIZATION")")
   fi
 
+  # config.google_analytics_automatic_screen_reporting_enabled
+  _ANALYTICS_AUTO_SCREEN_REPORTING=$(getFirebaseJsonKeyValue "$_JSON_OUTPUT_RAW" "google_analytics_automatic_screen_reporting_enabled")
+  if [[ $_ANALYTICS_AUTO_SCREEN_REPORTING ]]; then
+    _PLIST_ENTRY_KEYS+=("FirebaseAutomaticScreenReportingEnabled")
+    _PLIST_ENTRY_TYPES+=("bool")
+    _PLIST_ENTRY_VALUES+=("$(jsonBoolToYesNo "$_ANALYTICS_AUTO_SCREEN_REPORTING")")
+  fi
+
   # config.perf_auto_collection_enabled
   _PERF_AUTO_COLLECTION=$(getFirebaseJsonKeyValue "$_JSON_OUTPUT_RAW" "perf_auto_collection_enabled")
   if [[ $_PERF_AUTO_COLLECTION ]]; then

package/lib/version.js

@@ -1,2 +1,2 @@
 // generated by genversion
-module.exports = '13.1.0';
+module.exports = '14.1.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/app",
-  "version": "13.1.0",
+  "version": "14.1.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "A well tested, feature rich Firebase implementation for React Native, supporting iOS & Android. Individual module support for Admob, Analytics, Auth, Crash Reporting, Cloud Firestore, Database, Dynamic Links, Functions, Messaging (FCM), Remote Config, Storage and more.",
   "main": "lib/index.js",
@@ -56,7 +56,7 @@
     "react-native": "*"
   },
   "dependencies": {
-    "@expo/config-plugins": "^4.0.10",
+    "@expo/config-plugins": "^4.0.12",
     "opencollective-postinstall": "^2.0.1",
     "superstruct": "^0.6.2"
   },
@@ -72,12 +72,12 @@
       "targetSdk": 31,
       "compileSdk": 31,
       "buildTools": "30.0.3",
-      "firebase": "29.0.1",
+      "firebase": "29.0.3",
       "firebaseCrashlyticsGradle": "2.8.1",
       "firebasePerfGradle": "1.4.0",
       "gmsGoogleServicesGradle": "4.3.10",
-      "playServicesAuth": "19.2.0"
+      "playServicesAuth": "20.0.0"
     }
   },
-  "gitHead": "0a9621b1ad2d6592de9906157d121c8ba5460a75"
+  "gitHead": "8efda506474b1757f6a0537495a1de581d372299"
 }

package/plugin/build/ios/appDelegate.js

@@ -8,8 +8,11 @@ const config_plugins_1 = require("@expo/config-plugins");
 const generateCode_1 = require("@expo/config-plugins/build/utils/generateCode");
 const fs_1 = __importDefault(require("fs"));
 const methodInvocationBlock = `[FIRApp configure];`;
-// https://regex101.com/r/Imm3E8/1
-const methodInvocationLineMatcher = /(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[\[RCTBridge alloc\])/g;
+// https://regex101.com/r/mPgaq6/1
+const methodInvocationLineMatcher = /(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[(\[RCTBridge alloc\]|self\.reactDelegate))/g;
+// https://regex101.com/r/nHrTa9/1/
+// if the above regex fails, we can use this one as a fallback:
+const fallbackInvocationLineMatcher = /-\s*\(BOOL\)\s*application:\s*\(UIApplication\s*\*\s*\)\s*\w+\s+didFinishLaunchingWithOptions:/g;
 function modifyObjcAppDelegate(contents) {
     // Add import
     if (!contents.includes('@import Firebase;')) {
@@ -20,15 +23,38 @@ function modifyObjcAppDelegate(contents) {
     if (contents.includes(methodInvocationBlock)) {
         return contents;
     }
+    if (!methodInvocationLineMatcher.test(contents) &&
+        !fallbackInvocationLineMatcher.test(contents)) {
+        config_plugins_1.WarningAggregator.addWarningIOS('@react-native-firebase/app', 'Unable to determine correct Firebase insertion point in AppDelegate.m. Skipping Firebase addition.');
+        return contents;
+    }
     // Add invocation
-    return (0, generateCode_1.mergeContents)({
-        tag: '@react-native-firebase/app-didFinishLaunchingWithOptions',
-        src: contents,
-        newSrc: methodInvocationBlock,
-        anchor: methodInvocationLineMatcher,
-        offset: 0,
-        comment: '//',
-    }).contents;
+    try {
+        return (0, generateCode_1.mergeContents)({
+            tag: '@react-native-firebase/app-didFinishLaunchingWithOptions',
+            src: contents,
+            newSrc: methodInvocationBlock,
+            anchor: methodInvocationLineMatcher,
+            offset: 0,
+            comment: '//',
+        }).contents;
+    }
+    catch (e) {
+        // tests if the opening `{` is in the new line
+        const multilineMatcher = new RegExp(fallbackInvocationLineMatcher.source + '.+\\n*{');
+        const isHeaderMultiline = multilineMatcher.test(contents);
+        // we fallback to another regex if the first one fails
+        return (0, generateCode_1.mergeContents)({
+            tag: '@react-native-firebase/app-didFinishLaunchingWithOptions-fallback',
+            src: contents,
+            newSrc: methodInvocationBlock,
+            anchor: fallbackInvocationLineMatcher,
+            // new line will be inserted right below matched anchor
+            // or two lines, if the `{` is in the new line
+            offset: isHeaderMultiline ? 2 : 1,
+            comment: '//',
+        }).contents;
+    }
 }
 exports.modifyObjcAppDelegate = modifyObjcAppDelegate;
 const withFirebaseAppDelegate = config => {

package/plugin/src/ios/appDelegate.ts

@@ -1,11 +1,16 @@
-import { ConfigPlugin, IOSConfig, withDangerousMod } from '@expo/config-plugins';
+import { ConfigPlugin, IOSConfig, WarningAggregator, withDangerousMod } from '@expo/config-plugins';
 import { mergeContents } from '@expo/config-plugins/build/utils/generateCode';
 import fs from 'fs';
 
 const methodInvocationBlock = `[FIRApp configure];`;
-// https://regex101.com/r/Imm3E8/1
+// https://regex101.com/r/mPgaq6/1
 const methodInvocationLineMatcher =
-  /(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[\[RCTBridge alloc\])/g;
+  /(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[(\[RCTBridge alloc\]|self\.reactDelegate))/g;
+
+// https://regex101.com/r/nHrTa9/1/
+// if the above regex fails, we can use this one as a fallback:
+const fallbackInvocationLineMatcher =
+  /-\s*\(BOOL\)\s*application:\s*\(UIApplication\s*\*\s*\)\s*\w+\s+didFinishLaunchingWithOptions:/g;
 
 export function modifyObjcAppDelegate(contents: string): string {
   // Add import
@@ -22,15 +27,44 @@ export function modifyObjcAppDelegate(contents: string): string {
     return contents;
   }
 
+  if (
+    !methodInvocationLineMatcher.test(contents) &&
+    !fallbackInvocationLineMatcher.test(contents)
+  ) {
+    WarningAggregator.addWarningIOS(
+      '@react-native-firebase/app',
+      'Unable to determine correct Firebase insertion point in AppDelegate.m. Skipping Firebase addition.',
+    );
+    return contents;
+  }
+
   // Add invocation
-  return mergeContents({
-    tag: '@react-native-firebase/app-didFinishLaunchingWithOptions',
-    src: contents,
-    newSrc: methodInvocationBlock,
-    anchor: methodInvocationLineMatcher,
-    offset: 0, // new line will be inserted right before matched anchor
-    comment: '//',
-  }).contents;
+  try {
+    return mergeContents({
+      tag: '@react-native-firebase/app-didFinishLaunchingWithOptions',
+      src: contents,
+      newSrc: methodInvocationBlock,
+      anchor: methodInvocationLineMatcher,
+      offset: 0, // new line will be inserted right above matched anchor
+      comment: '//',
+    }).contents;
+  } catch (e: any) {
+    // tests if the opening `{` is in the new line
+    const multilineMatcher = new RegExp(fallbackInvocationLineMatcher.source + '.+\\n*{');
+    const isHeaderMultiline = multilineMatcher.test(contents);
+
+    // we fallback to another regex if the first one fails
+    return mergeContents({
+      tag: '@react-native-firebase/app-didFinishLaunchingWithOptions-fallback',
+      src: contents,
+      newSrc: methodInvocationBlock,
+      anchor: fallbackInvocationLineMatcher,
+      // new line will be inserted right below matched anchor
+      // or two lines, if the `{` is in the new line
+      offset: isHeaderMultiline ? 2 : 1,
+      comment: '//',
+    }).contents;
+  }
 }
 
 export const withFirebaseAppDelegate: ConfigPlugin = config => {