Merge branch 'master' into feature/new-firebase-crashlytics-sdk

invertase · Jun 11, 2020 · 5a72ffc · 5a72ffc
2 parents c011d67 + 2821001
commit 5a72ffc
Show file tree

Hide file tree

Showing 41 changed files with 191 additions and 65 deletions.
diff --git a/.gitignore b/.gitignore
@@ -549,8 +549,9 @@ tests/ios/resetXcode.sh
 google-services.json
 GoogleService-Info.plist
 
-# generated file
+# generated files
 RNFBVersion.m
+ReactNativeFirebaseVersion.java
 
 appPlaygrounds/
 app.playground.js

diff --git a/packages/admob/CHANGELOG.md b/packages/admob/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.1.4](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/admob@7.1.3...@react-native-firebase/admob@7.1.4) (2020-06-10)
+
+**Note:** Version bump only for package @react-native-firebase/admob
+
 ## [7.1.3](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/admob@7.1.2...@react-native-firebase/admob@7.1.3) (2020-06-03)
 
 **Note:** Version bump only for package @react-native-firebase/admob

diff --git a/packages/admob/package.json b/packages/admob/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/admob",
-  "version": "7.1.3",
+  "version": "7.1.4",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - Google AdMob is an easy way to monetize mobile apps with targeted, in-app advertising.",
   "main": "lib/index.js",
@@ -27,7 +27,7 @@
     "ad consent"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "7.2.0"
+    "@react-native-firebase/app": "7.2.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/analytics/CHANGELOG.md b/packages/analytics/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.1.4](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/analytics@7.1.3...@react-native-firebase/analytics@7.1.4) (2020-06-10)
+
+**Note:** Version bump only for package @react-native-firebase/analytics
+
 ## [7.1.3](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/analytics@7.1.2...@react-native-firebase/analytics@7.1.3) (2020-06-03)
 
 **Note:** Version bump only for package @react-native-firebase/analytics

diff --git a/packages/analytics/package.json b/packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/analytics",
-  "version": "7.1.3",
+  "version": "7.1.4",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - The analytics module provides out of the box support with Google Analytics for Firebase. Integration with the Android & iOS allows for in-depth analytical insight reporting, such as device information, location, user actions and more.",
   "main": "lib/index.js",
@@ -22,7 +22,7 @@
     "analytics"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "7.2.0"
+    "@react-native-firebase/app": "7.2.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.2.1](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/app@7.2.0...@react-native-firebase/app@7.2.1) (2020-06-10)
+
+### Bug Fixes
+
+- **android:** generate version for ReactNativeFirebaseAppRegistrar.java ([#3766](https://github.com/invertase/react-native-firebase/issues/3766)) ([1324985](https://github.com/invertase/react-native-firebase/commit/13249857c7303d44b9a2ca92d2604a27e949bad9))
+
 # [7.2.0](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/app@7.1.4...@react-native-firebase/app@7.2.0) (2020-06-03)
 
 ### Features

diff --git a/...droid/src/reactnative/java/io/invertase/firebase/app/ReactNativeFirebaseAppRegistrar.java b/...droid/src/reactnative/java/io/invertase/firebase/app/ReactNativeFirebaseAppRegistrar.java
@@ -26,17 +26,15 @@
 import java.util.Collections;
 import java.util.List;
 
-import io.invertase.firebase.BuildConfig;
-
 @Keep
 public class ReactNativeFirebaseAppRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {
-    return Collections.singletonList(
-      LibraryVersionComponent.create(
-        "react-native-firebase",
-        BuildConfig.VERSION_NAME
-      )
-    );
+    return Collections
+        .singletonList(
+            LibraryVersionComponent.create(
+                "react-native-firebase", 
+                ReactNativeFirebaseVersion.VERSION
+        ));
   }
 }
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,12 +1,13 @@
 {
   "name": "@react-native-firebase/app",
-  "version": "7.2.0",
+  "version": "7.2.1",
   "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",
   "types": "lib/index.d.ts",
   "scripts": {
-    "build": "genversion --semi lib/version.js && node ./scripts/genversion-ios",
+    "build": "genversion --semi lib/version.js && npm run build:version",
+    "build:version": "node ./scripts/genversion-ios && node ./scripts/genversion-android",
     "build:clean": "rimraf android/build && rimraf ios/build",
     "prepare": "npm run build"
   },

diff --git a/packages/app/scripts/genversion-android.js b/packages/app/scripts/genversion-android.js
@@ -0,0 +1,36 @@
+const fs = require('fs');
+const path = require('path');
+
+const version = require('../lib/version');
+const outputPath = path.resolve(
+  __dirname,
+  '..',
+  'android',
+  'src/reactnative/java/io/invertase/firebase/app',
+  'ReactNativeFirebaseVersion.java',
+);
+const template = `
+package io.invertase.firebase.app;
+/*
+ * 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.
+ *
+ */
+// generated file - do not modify or commit
+public class ReactNativeFirebaseVersion {
+  public static String VERSION = "version_number";
+}
+`;
+
+fs.writeFileSync(outputPath, template.replace('version_number', `${version}`), 'utf8');
diff --git a/packages/auth/CHANGELOG.md b/packages/auth/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.0.5](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/auth@8.0.4...@react-native-firebase/auth@8.0.5) (2020-06-10)
+
+**Note:** Version bump only for package @react-native-firebase/auth
+
 ## [8.0.4](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/auth@8.0.3...@react-native-firebase/auth@8.0.4) (2020-06-03)
 
 **Note:** Version bump only for package @react-native-firebase/auth

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/auth",
-  "version": "8.0.4",
+  "version": "8.0.5",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - The authentication module provides an easy-to-use API to integrate an authentication workflow into new and existing applications. React Native Firebase provides access to all Firebase authentication methods and identity providers.",
   "main": "lib/index.js",
@@ -22,7 +22,7 @@
     "auth"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "7.2.0"
+    "@react-native-firebase/app": "7.2.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/crashlytics/CHANGELOG.md b/packages/crashlytics/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.1.5](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/crashlytics@7.1.4...@react-native-firebase/crashlytics@7.1.5) (2020-06-10)
+
+**Note:** Version bump only for package @react-native-firebase/crashlytics
+
 ## [7.1.4](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/crashlytics@7.1.3...@react-native-firebase/crashlytics@7.1.4) (2020-06-03)
 
 **Note:** Version bump only for package @react-native-firebase/crashlytics

diff --git a/packages/crashlytics/package.json b/packages/crashlytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/crashlytics",
-  "version": "7.1.4",
+  "version": "7.1.5",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - Firebase Crashlytics is a lightweight, realtime crash reporter that helps you track, prioritize, and fix stability issues that erode your app quality. React Native Firebase provides automatic crash reporting for both native and JavaScript errors, including unhandled promise rejections.",
   "main": "lib/index.js",
@@ -27,7 +27,7 @@
     "crashlytics"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "7.2.0"
+    "@react-native-firebase/app": "7.2.1"
   },
   "dependencies": {
     "stacktrace-js": "^2.0.0"

diff --git a/packages/database/CHANGELOG.md b/packages/database/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.2.2](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/database@7.2.1...@react-native-firebase/database@7.2.2) (2020-06-10)
+
+**Note:** Version bump only for package @react-native-firebase/database
+
 ## [7.2.1](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/database@7.2.0...@react-native-firebase/database@7.2.1) (2020-06-03)
 
 **Note:** Version bump only for package @react-native-firebase/database

diff --git a/packages/database/package.json b/packages/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/database",
-  "version": "7.2.1",
+  "version": "7.2.2",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - The Firebase Realtime Database is a cloud-hosted database. Data is stored as JSON and synchronized in realtime to every connected client. React Native Firebase provides native integration with the Android & iOS Firebase SDKs, supporting both realtime data sync and offline capabilities.",
   "main": "lib/index.js",
@@ -25,7 +25,7 @@
     "realtome database"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "7.2.0"
+    "@react-native-firebase/app": "7.2.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/dynamic-links/CHANGELOG.md b/packages/dynamic-links/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.1.4](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/dynamic-links@7.1.3...@react-native-firebase/dynamic-links@7.1.4) (2020-06-10)
+
+**Note:** Version bump only for package @react-native-firebase/dynamic-links
+
 ## [7.1.3](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/dynamic-links@7.1.2...@react-native-firebase/dynamic-links@7.1.3) (2020-06-03)
 
 **Note:** Version bump only for package @react-native-firebase/dynamic-links

diff --git a/packages/dynamic-links/package.json b/packages/dynamic-links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/dynamic-links",
-  "version": "7.1.3",
+  "version": "7.1.4",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - Dynamic Links",
   "main": "lib/index.js",
@@ -23,7 +23,7 @@
     "dynamic link"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "7.2.0"
+    "@react-native-firebase/app": "7.2.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/firestore/CHANGELOG.md b/packages/firestore/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.1.7](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/firestore@7.1.6...@react-native-firebase/firestore@7.1.7) (2020-06-10)
+
+**Note:** Version bump only for package @react-native-firebase/firestore
+
+## [7.1.6](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/firestore@7.1.5...@react-native-firebase/firestore@7.1.6) (2020-06-10)
+
+**Note:** Version bump only for package @react-native-firebase/firestore
+
 ## [7.1.5](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/firestore@7.1.4...@react-native-firebase/firestore@7.1.5) (2020-06-03)
 
 ### Bug Fixes

diff --git a/packages/firestore/lib/index.d.ts b/packages/firestore/lib/index.d.ts
@@ -276,7 +276,7 @@ export namespace FirebaseFirestoreTypes {
      *
      * // false
      * alovelace.isEqual(dsmith);
-     * ``
+     * ```
      *
      * @param other The `DocumentReference` to compare against.
      */
@@ -417,7 +417,7 @@ export namespace FirebaseFirestoreTypes {
      *   age: 30,
      *   city: 'LON',
      * });
-     * ``
+     * ```
      *
      * @param data A map of the fields and values for the document.
      * @param options An object to configure the set behavior.

diff --git a/packages/firestore/lib/index.js.flow b/packages/firestore/lib/index.js.flow
@@ -226,7 +226,7 @@ export interface DocumentReference {
    *
    * // false
    * alovelace.isEqual(dsmith);
-   * ``
+   * ```
    *
    * @param other The `DocumentReference` to compare against.
    */
@@ -355,7 +355,7 @@ export interface DocumentReference {
    *   age: 30,
    *   city: 'LON',
    * });
-   * ``
+   * ```
    *
    * @param data A map of the fields and values for the document.
    * @param options An object to configure the set behavior.

diff --git a/packages/firestore/package.json b/packages/firestore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/firestore",
-  "version": "7.1.5",
+  "version": "7.1.7",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - Cloud Firestore is a NoSQL cloud database to store and sync data between your React Native application and Firebase's database. The API matches the Firebase Web SDK whilst taking advantage of the native SDKs performance and offline capabilities.",
   "main": "lib/index.js",
@@ -27,7 +27,7 @@
     "firestore"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "7.2.0"
+    "@react-native-firebase/app": "7.2.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/functions/CHANGELOG.md b/packages/functions/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.1.4](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/functions@7.1.3...@react-native-firebase/functions@7.1.4) (2020-06-10)
+
+**Note:** Version bump only for package @react-native-firebase/functions
+
 ## [7.1.3](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/functions@7.1.2...@react-native-firebase/functions@7.1.3) (2020-06-03)
 
 **Note:** Version bump only for package @react-native-firebase/functions

diff --git a/packages/functions/package.json b/packages/functions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/functions",
-  "version": "7.1.3",
+  "version": "7.1.4",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - Cloud Functions for Firebase lets you automatically run backend code in response to events triggered by Firebase features and HTTPS requests. React Native Firebase supports integration with production and locally emulated Cloud Functions with a simple API interface.\n\n",
   "main": "lib/index.js",
@@ -24,7 +24,7 @@
     "functions"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "7.2.0"
+    "@react-native-firebase/app": "7.2.1"
   },
   "devDependencies": {
     "@react-native-firebase/private-tests-firebase-functions": "^0.0.1"

diff --git a/packages/iid/CHANGELOG.md b/packages/iid/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.1.4](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/iid@7.1.3...@react-native-firebase/iid@7.1.4) (2020-06-10)
+
+**Note:** Version bump only for package @react-native-firebase/iid
+
 ## [7.1.3](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/iid@7.1.2...@react-native-firebase/iid@7.1.3) (2020-06-03)
 
 **Note:** Version bump only for package @react-native-firebase/iid

diff --git a/packages/iid/package.json b/packages/iid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/iid",
-  "version": "7.1.3",
+  "version": "7.1.4",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - Firebase Instance ID provides a unique identifier for each instance of your app and a mechanism to authenticate and authorize actions for it (for example: sending FCM messages).",
   "main": "lib/index.js",
@@ -24,7 +24,7 @@
     "iid"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "7.2.0"
+    "@react-native-firebase/app": "7.2.1"
   },
   "publishConfig": {
     "access": "public"