Merge branch 'master' of https://github.com/invertase/react-native-firebase into multi-apps

# Conflicts:
#	ios/RNFirebase.xcodeproj/project.pbxproj

README.md

@@ -41,7 +41,7 @@ All in all, RNFirebase provides much faster performance (~2x) over the web SDK a
 
 > The Web SDK column indicates what modules from the Firebase Web SDK are usable with React Native.
 
-| Firebase Features      | v1  | [v2](https://github.com/invertase/react-native-firebase/pull/130)  | Web SDK |
+| Firebase Features      | v1  | v2  | Web SDK |
 | ---------------------- | :---: | :---: | :---: |
 | AdMob                  | ❌ | ✅ | ❌ |
 | Analytics              | ✅ | ✅ | ❌ |
@@ -59,13 +59,18 @@ All in all, RNFirebase provides much faster performance (~2x) over the web SDK a
 | Storage                | ✅ | ✅ | ❌ |
 
 ---
-### Supported versions - Firebase / React Native
+### Supported versions - React Native / Firebase
 
-> The table below shows the minimum supported versions of the Firebase SDKs and React Native
+> The table below shows the supported version of `react-native-firebase` for different React Native versions
 
-|                        | v1  | [v2](https://github.com/invertase/react-native-firebase/pull/130)
+|                                 | v0.36 - v0.39  | v0.40 - v0.46  | v0.47 +
+| ------------------------------- | :---: | :---: | :---: |
+| react-native-firebase           | 1.X.X | 2.X.X | 2.1.X |
+
+> The table below shows the minimum supported versions of the Firebase SDKs for each version of `react-native-firebase`
+
+|                        | v1  | v2  |
 | ---------------------- | :---: | :---: |
-| React Native           | 0.36.0+ | 0.40.0 + |
 | Firebase Android SDK   | 10.2.0+ | 11.0.0 + |
 | Firebase iOS SDK       | 3.15.0+ | 4.0.0 +  |
 

android/src/main/java/io/invertase/firebase/RNFirebasePackage.java

@@ -38,7 +38,7 @@ public class RNFirebasePackage implements ReactPackage {
    * listed here. Also listing a native module here doesn't imply that the JS implementation of it
    * will be automatically included in the JS bundle.
    */
-  @Override
+  // TODO: Removed in 0.47.0. Here for backwards compatability
   public List<Class<? extends JavaScriptModule>> createJSModules() {
     return Collections.emptyList();
   }

android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdMobPackage.java

@@ -36,7 +36,7 @@ public class RNFirebaseAdMobPackage implements ReactPackage {
    * listed here. Also listing a native module here doesn't imply that the JS implementation of it
    * will be automatically included in the JS bundle.
    */
-  @Override
+  // TODO: Removed in 0.47.0. Here for backwards compatability
   public List<Class<? extends JavaScriptModule>> createJSModules() {
     return Collections.emptyList();
   }

android/src/main/java/io/invertase/firebase/analytics/RNFirebaseAnalyticsPackage.java

@@ -35,7 +35,7 @@ public class RNFirebaseAnalyticsPackage implements ReactPackage {
    * listed here. Also listing a native module here doesn't imply that the JS implementation of it
    * will be automatically included in the JS bundle.
    */
-  @Override
+  // TODO: Removed in 0.47.0. Here for backwards compatability
   public List<Class<? extends JavaScriptModule>> createJSModules() {
     return Collections.emptyList();
   }

android/src/main/java/io/invertase/firebase/auth/RNFirebaseAuthPackage.java

@@ -35,7 +35,7 @@ public class RNFirebaseAuthPackage implements ReactPackage {
    * listed here. Also listing a native module here doesn't imply that the JS implementation of it
    * will be automatically included in the JS bundle.
    */
-  @Override
+  // TODO: Removed in 0.47.0. Here for backwards compatability
   public List<Class<? extends JavaScriptModule>> createJSModules() {
     return Collections.emptyList();
   }

android/src/main/java/io/invertase/firebase/config/RNFirebaseRemoteConfigPackage.java

@@ -35,7 +35,7 @@ public class RNFirebaseRemoteConfigPackage implements ReactPackage {
    * listed here. Also listing a native module here doesn't imply that the JS implementation of it
    * will be automatically included in the JS bundle.
    */
-  @Override
+  // TODO: Removed in 0.47.0. Here for backwards compatability
   public List<Class<? extends JavaScriptModule>> createJSModules() {
     return Collections.emptyList();
   }

android/src/main/java/io/invertase/firebase/crash/RNFirebaseCrashPackage.java

@@ -35,7 +35,7 @@ public class RNFirebaseCrashPackage implements ReactPackage {
    * listed here. Also listing a native module here doesn't imply that the JS implementation of it
    * will be automatically included in the JS bundle.
    */
-  @Override
+  // TODO: Removed in 0.47.0. Here for backwards compatability
   public List<Class<? extends JavaScriptModule>> createJSModules() {
     return Collections.emptyList();
   }

android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabasePackage.java

@@ -35,7 +35,7 @@ public class RNFirebaseDatabasePackage implements ReactPackage {
    * listed here. Also listing a native module here doesn't imply that the JS implementation of it
    * will be automatically included in the JS bundle.
    */
-  @Override
+  // TODO: Removed in 0.47.0. Here for backwards compatability
   public List<Class<? extends JavaScriptModule>> createJSModules() {
     return Collections.emptyList();
   }

android/src/main/java/io/invertase/firebase/messaging/RNFirebaseMessagingPackage.java

@@ -35,7 +35,7 @@ public class RNFirebaseMessagingPackage implements ReactPackage {
    * listed here. Also listing a native module here doesn't imply that the JS implementation of it
    * will be automatically included in the JS bundle.
    */
-  @Override
+  // TODO: Removed in 0.47.0. Here for backwards compatability
   public List<Class<? extends JavaScriptModule>> createJSModules() {
     return Collections.emptyList();
   }

android/src/main/java/io/invertase/firebase/perf/RNFirebasePerformancePackage.java

@@ -35,7 +35,7 @@ public class RNFirebasePerformancePackage implements ReactPackage {
    * listed here. Also listing a native module here doesn't imply that the JS implementation of it
    * will be automatically included in the JS bundle.
    */
-  @Override
+  // TODO: Removed in 0.47.0. Here for backwards compatability
   public List<Class<? extends JavaScriptModule>> createJSModules() {
     return Collections.emptyList();
   }

android/src/main/java/io/invertase/firebase/storage/RNFirebaseStoragePackage.java

@@ -35,7 +35,7 @@ public class RNFirebaseStoragePackage implements ReactPackage {
    * listed here. Also listing a native module here doesn't imply that the JS implementation of it
    * will be automatically included in the JS bundle.
    */
-  @Override
+  // TODO: Removed in 0.47.0. Here for backwards compatability
   public List<Class<? extends JavaScriptModule>> createJSModules() {
     return Collections.emptyList();
   }

docs/README.md

@@ -32,30 +32,35 @@ All in all, RNFirebase provides much faster performance (~2x) over the web SDK a
 ## Supported Firebase Features
 > The Web SDK column indicates what modules from the Firebase Web SDK are usable within React Native.
 
-| Firebase Features      | v1  | [v2](https://github.com/invertase/react-native-firebase/pull/130)  | Web SDK |
+| Firebase Features      | v1  | v2  | Web SDK |
 | ---------------------- | :---: | :---: | :---: |
 | AdMob                  | ❌ | ✅ | ❌ |
 | Analytics              | ✅ | ✅ | ❌ |
 | App Indexing           | ❌ | ❌ | ❌ |
 | Authentication         | ✅ | ✅ | ✅ |
-| Cloud Messaging        | ✅ | ✅ | ❌ |
+| Cloud Messaging (FCM)  | ✅ | ✅ | ❌ |
 | Crash Reporting        | ✅ | ✅ | ❌ |
 | Dynamic Links          | ❌ | ❌ | ❌ |
 | Invites                | ❌ | ❌ | ❌ |
 | Performance Monitoring | ✅ | ✅ | ❌ |
 | Realtime Database      | ✅ | ✅ | ✅ |
-|  - Offline Persistance | ✅ | ✅ | ❌ |
+|  - Offline Persistence | ✅ | ✅ | ❌ |
 |  - Transactions        | ✅ | ✅ | ✅ |
 | Remote Config          | ✅ | ✅ | ❌ |
 | Storage                | ✅ | ✅ | ❌ |
 
 ---
-### Supported versions - Firebase / React Native
+### Supported versions - React Native / Firebase
 
-> The table below shows the minimum supported versions of the Firebase SDKs and React Native
+> The table below shows the supported version of `react-native-firebase` for different React Native versions
 
-|                        | v1  | [v2](https://github.com/invertase/react-native-firebase/pull/130)
+|                                 | v0.36 - v0.39  | v0.40 - v0.46  | v0.47 +
+| ------------------------------- | :---: | :---: | :---: |
+| react-native-firebase           | 1.X.X | 2.X.X | 2.1.X |
+
+> The table below shows the minimum supported versions of the Firebase SDKs for each version of `react-native-firebase`
+
+|                        | v1  | v2  |
 | ---------------------- | :---: | :---: |
-| React Native           | 0.36.0+ | 0.40.0 + |
 | Firebase Android SDK   | 10.2.0+ | 11.0.0 + |
 | Firebase iOS SDK       | 3.15.0+ | 4.0.0 +  |

docs/installation-ios.md

@@ -70,7 +70,7 @@ pod 'Firebase/RemoteConfig'
 pod 'Firebase/Storage'
 ```
 
-If you are new to Cocoapods or do not already have React installed as a pod, then add Yoga and React to your `Podfile` as follows:
+If you do not already have React and Yoga installed as pods, then add Yoga and React to your `Podfile` as follows:
 
 ```ruby
 pod "Yoga", :path => "../node_modules/react-native/ReactCommon/yoga"

package.json

@@ -1,8 +1,8 @@
 {
   "name": "react-native-firebase",
-  "version": "2.0.5",
+  "version": "2.1.0",
   "author": "Invertase <contact@invertase.io> (http://invertase.io)",
-  "description": "A well tested, feature rich Firebase implementation for React Native, supporting iOS & Android. Individual module support for Auth, Database, Messaging, Remote Config, Storage, Admob, Analytics, Crash Reporting, and Performance.",
+  "description": "A well tested, feature rich Firebase implementation for React Native, supporting iOS & Android. Individual module support for Auth, Database, Messaging (FCM), Remote Config, Storage, Admob, Analytics, Crash Reporting, and Performance.",
   "main": "index",
   "scripts": {
     "build": "./node_modules/.bin/babel --source-maps=true --out-dir=dist .",