Merge branch dev to master

souly1 · Aug 6, 2019 · 8478c49 · 8478c49
2 parents da4efaf + a9c6674
commit 8478c49
Show file tree

Hide file tree

Showing 6 changed files with 658 additions and 445 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -44,7 +44,6 @@
 			<meta-data android:name="com.google.firebase.messaging.default_notification_color" android:resource="@color/accent" />
 			<meta-data android:name="com.google.firebase.messaging.default_notification_channel_id" android:value="@string/default_notification_channel_id"/>
 		</config-file>
-		<resource-file src="src/android/google-services.json" target="."/>
 		<resource-file src="src/android/cordova-plugin-firebase-strings.xml" target="res/values/cordova-plugin-firebase-strings.xml" />
 		<source-file src="src/android/FirebasePlugin.java" target-dir="src/org/apache/cordova/firebase" />
 		<source-file src="src/android/OnNotificationOpenReceiver.java" target-dir="src/org/apache/cordova/firebase" />
@@ -109,8 +108,6 @@
 			</array>
 		</config-file>
 
-		<resource-file src="src/ios/GoogleService-Info.plist" />
-
 		<header-file src="src/ios/AppDelegate+FirebasePlugin.h" />
 		<source-file src="src/ios/AppDelegate+FirebasePlugin.m" />
 		<header-file src="src/ios/FirebasePlugin.h" />

diff --git a/src/android/google-services.json b/src/android/google-services.json