@react-native-firebase/app 21.4.1 → 21.6.0

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [21.6.0](https://github.com/invertase/react-native-firebase/compare/v21.5.0...v21.6.0) (2024-11-20)
+
+### Features
+
+- **ios, sdk:** allow FIREBASE_SDK_VERSION override ([8cbe59f](https://github.com/invertase/react-native-firebase/commit/8cbe59fbf771df6ba932832c9d4fd17bf500ea91))
+
+### Bug Fixes
+
+- **analytics:** update superstruct dependency / forward-port to new API ([#8153](https://github.com/invertase/react-native-firebase/issues/8153)) ([6db1fb4](https://github.com/invertase/react-native-firebase/commit/6db1fb471e62e2c7e434719f2616c76349f345be))
+
+## [21.5.0](https://github.com/invertase/react-native-firebase/compare/v21.4.1...v21.5.0) (2024-11-16)
+
+### Bug Fixes
+
+- **android:** forward-port to non-deprecated data collection API ([2c87eeb](https://github.com/invertase/react-native-firebase/commit/2c87eeb3f0e8053ab02d4f6cce047ad61a6310fa))
+- **android:** rn74 forward-port onCatalystInstanceDestroy -> invalidate ([83696ea](https://github.com/invertase/react-native-firebase/commit/83696ea4c944b2be0b8fd9f2fc1db212800cbcf8))
+
 ## [21.4.1](https://github.com/invertase/react-native-firebase/compare/v21.4.0...v21.4.1) (2024-11-13)
 
 ### Bug Fixes

package/RNFBApp.podspec

@@ -27,6 +27,11 @@ Pod::Spec.new do |s|
   # React Native dependencies
   s.dependency          'React-Core'
 
+  if (ENV.include?('FIREBASE_SDK_VERSION'))
+    Pod::UI.puts "#{s.name}: Found Firebase SDK version in environment '#{ENV['FIREBASE_SDK_VERSION']}'"
+    $FirebaseSDKVersion = ENV['FIREBASE_SDK_VERSION']
+  end
+
   if defined?($FirebaseSDKVersion)
     Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
     firebase_sdk_version = $FirebaseSDKVersion

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 = "21.4.1";
+  public static String VERSION = "21.6.0";
 }

package/android/src/reactnative/java/io/invertase/firebase/common/RCTConvertFirebase.java

@@ -98,7 +98,7 @@ public class RCTConvertFirebase {
 
     if (appConfig.hasKey("automaticDataCollectionEnabled")) {
       firebaseApp.setDataCollectionDefaultEnabled(
-          appConfig.getBoolean("automaticDataCollectionEnabled"));
+          Boolean.valueOf(appConfig.getBoolean("automaticDataCollectionEnabled")));
     }
 
     if (appConfig.hasKey("automaticResourceManagement")) {

package/android/src/reactnative/java/io/invertase/firebase/common/ReactNativeFirebaseModule.java

@@ -92,9 +92,26 @@ public class ReactNativeFirebaseModule extends ReactContextBaseJavaModule
     return executorService.getTransactionalExecutor(identifier);
   }
 
-  @Override
-  @CallSuper
+
+  // This is no longer called as of react-native 0.74 and is only here for
+  // compatibility with older versions. It delegates to thew new `invalidate`
+  // method, which all modules should implement now
+  // Remove this method when minimum supported react-native is 0.74
+  /** @noinspection removal*/
+  @SuppressWarnings({"deprecation", "removal"})
+  @Deprecated
   public void onCatalystInstanceDestroy() {
+    // This should call the child class invalidate, which will then call super.invalidate,
+    // and everything will work correctly up and down the inheritance hierarchy to shut down
+    invalidate();
+  }
+
+  // This should have an @Override annotation but we cannot do
+  // that until our minimum supported react-native version is 0.74, since the
+  // method did not exist before then
+  @CallSuper
+  public void invalidate() {
+    super.invalidate();
     executorService.shutdown();
   }
 

package/android/src/reactnative/java/io/invertase/firebase/common/SharedUtils.java

@@ -17,6 +17,7 @@ package io.invertase.firebase.common;
  *
  */
 
+import android.annotation.SuppressLint;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.graphics.Point;
@@ -181,6 +182,7 @@ public class SharedUtils {
     return false;
   }
 
+  @SuppressLint("DiscouragedApi")
   public static int getResId(Context ctx, String resName) {
     int resourceId = ctx.getResources().getIdentifier(resName, "string", ctx.getPackageName());
 

package/ios/RNFBApp/RNFBVersion.m

@@ -18,4 +18,4 @@
 #import <React/RCTVersion.h>
 
 // generated file - do not modify or commit
-NSString* const RNFBVersionString = @"21.4.1";
+NSString* const RNFBVersionString = @"21.6.0";

package/lib/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-module.exports = '21.4.1';
+module.exports = '21.6.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/app",
-  "version": "21.4.1",
+  "version": "21.6.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",
@@ -57,8 +57,7 @@
     "react-native": "*"
   },
   "dependencies": {
-    "firebase": "10.13.2",
-    "superstruct": "^0.6.2"
+    "firebase": "10.13.2"
   },
   "devDependencies": {
     "@react-native-async-storage/async-storage": "^1.24.0",
@@ -90,5 +89,5 @@
       "playServicesAuth": "21.2.0"
     }
   },
-  "gitHead": "1c4301c4f57fe6fe8235e73e13a523ad1af156ad"
+  "gitHead": "0103e12714de3c106128859eeadaf0fe07f9674c"
 }

package/lib/common/struct.js

@@ -1,52 +0,0 @@
-/*
- *  Copyright (c) 2016-present Invertase Limited & Contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this library except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { superstruct } from 'superstruct/lib/index';
-import { isUndefined } from './validate';
-
-export default superstruct({
-  types: {
-    shortDate: value => typeof value === 'string' && !!value.match(/^\d{4}-\d{2}-\d{2}$/),
-  },
-});
-
-export const validateStruct = (value = {}, struct, prefix = '') => {
-  try {
-    return struct(value);
-  } catch (e) {
-    const { path, reason } = e;
-    const key = path[0];
-
-    if (reason === undefined) {
-      throw new Error(`${prefix} unknown property '${key}'.`);
-    }
-
-    e.message = `${prefix} ${e.message}`;
-
-    throw e;
-  }
-};
-
-export const validateCompound = (source = {}, a, b, prefix = '') => {
-  if (
-    (isUndefined(source[a]) && !isUndefined(source[b])) ||
-    (!isUndefined(source[a]) && isUndefined(source[b]))
-  ) {
-    throw new Error(
-      `${prefix} if you supply the '${a}' parameter, you must also supply the '${b}' parameter.`,
-    );
-  }
-};