From 8408160d93be7f9a29f4aea9df3799aafdf6f69e Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Sun, 15 Aug 2021 00:02:50 -0500
Subject: [PATCH] fix(app, android): put app init provider / registrar in
 correct manifest

local inspection of merged manifest indicated they were not being included as thought,
moving them to this manifest shows they are being included
---
 .../app/android/src/main/AndroidManifest.xml    | 17 ++++++++++++++++-
 .../android/src/reactnative/AndroidManifest.xml | 17 +----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/app/android/src/main/AndroidManifest.xml b/packages/app/android/src/main/AndroidManifest.xml
index fa36d97c0c..9b09b9308e 100644
--- a/packages/app/android/src/main/AndroidManifest.xml
+++ b/packages/app/android/src/main/AndroidManifest.xml
@@ -1,2 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.invertase.firebase" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="io.invertase.firebase">
+
+  <application>
+    <service android:name="com.google.firebase.components.ComponentDiscoveryService">
+      <meta-data
+        android:name="com.google.firebase.components:io.invertase.firebase.app.ReactNativeFirebaseAppRegistrar"
+        android:value="com.google.firebase.components.ComponentRegistrar" />
+    </service>
+    <provider
+      android:name="io.invertase.firebase.app.ReactNativeFirebaseAppInitProvider"
+      android:authorities="${applicationId}.reactnativefirebaseappinitprovider"
+      android:exported="false"
+      android:initOrder="99" /> <!-- Firebase = 100, using 99 to run after Firebase initialises (highest first) -->
+  </application>
+</manifest>
diff --git a/packages/app/android/src/reactnative/AndroidManifest.xml b/packages/app/android/src/reactnative/AndroidManifest.xml
index 9b09b9308e..fa36d97c0c 100644
--- a/packages/app/android/src/reactnative/AndroidManifest.xml
+++ b/packages/app/android/src/reactnative/AndroidManifest.xml
@@ -1,17 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="io.invertase.firebase">
-
-  <application>
-    <service android:name="com.google.firebase.components.ComponentDiscoveryService">
-      <meta-data
-        android:name="com.google.firebase.components:io.invertase.firebase.app.ReactNativeFirebaseAppRegistrar"
-        android:value="com.google.firebase.components.ComponentRegistrar" />
-    </service>
-    <provider
-      android:name="io.invertase.firebase.app.ReactNativeFirebaseAppInitProvider"
-      android:authorities="${applicationId}.reactnativefirebaseappinitprovider"
-      android:exported="false"
-      android:initOrder="99" /> <!-- Firebase = 100, using 99 to run after Firebase initialises (highest first) -->
-  </application>
-</manifest>
+<manifest package="io.invertase.firebase" />