Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #494: App won't compile when two plugins use GoogleServicesPlugin #495

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issue #494: App won't compile when two plugins use GoogleServicesPlugin #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 38 additions & 59 deletions plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,27 @@
specific language governing permissions and limitations
under the License.
-->
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
id="cordova-plugin-fcm"
version="2.1.2">
<name>FCMPlugin</name>
<description>Cordova FCM Plugin</description>
<license>Apache 2.0</license>
<keywords>cordova, fcm, push, plugin</keywords>

<info>
Cordova FCM plugin v2.1.2 installed
For more details visit https://github.com/fechanique/cordova-plugin-fcm
</info>

<js-module src="www/FCMPlugin.js" name="FCMPlugin">
<clobbers target="FCMPlugin" />
</js-module>

<engines>
<engine name="cordova-android" version=">=4.0.0" />
</engines>

<!-- ANDROID CONFIGURATION -->
<platform name="android">
<plugin
xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-fcm" version="2.1.2">
<name>FCMPlugin</name>
<description>Cordova FCM Plugin</description>
<license>Apache 2.0</license>
<keywords>cordova, fcm, push, plugin</keywords>
<info> Cordova FCM plugin v2.1.2 installed For more details visit https://github.com/fechanique/cordova-plugin-fcm </info>
<js-module src="www/FCMPlugin.js" name="FCMPlugin">
<clobbers target="FCMPlugin" />
</js-module>
<engines>
<engine name="cordova-android" version=">=4.0.0" />
</engines>
<!-- ANDROID CONFIGURATION -->
<platform name="android">
<config-file target="AndroidManifest.xml" parent="/manifest/application">
<activity android:exported="true" android:name="com.gae.scaffolder.plugin.FCMPluginActivity" android:launchMode="singleTop">
<intent-filter>
<action android:name="FCM_PLUGIN_ACTIVITY" />
<intent-filter>
<action android:name="FCM_PLUGIN_ACTIVITY" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</intent-filter>
</activity>
<service android:name="com.gae.scaffolder.plugin.MyFirebaseMessagingService">
<intent-filter>
Expand All @@ -59,50 +51,40 @@
</service>
</config-file>
<config-file target="res/xml/config.xml" parent="/*">
<feature name="FCMPlugin" >
<param name="android-package" value="com.gae.scaffolder.plugin.FCMPlugin"/>
<param name="onload" value="true" />
</feature>
<feature name="FCMPlugin">
<param name="android-package" value="com.gae.scaffolder.plugin.FCMPlugin"/>
<param name="onload" value="true" />
</feature>
</config-file>

<framework src="com.google.firebase:firebase-core:+" />
<framework src="com.google.firebase:firebase-messaging:+" />

<framework src="src/android/FCMPlugin.gradle" custom="true" type="gradleReference"/>

<framework src="com.google.firebase:firebase-core:+" />
<framework src="com.google.firebase:firebase-messaging:+" />
<dependency id="cordova-support-google-services" version="~1.1.0"/>
<source-file src="src/android/FCMPlugin.java" target-dir="src/com/gae/scaffolder/plugin" />
<source-file src="src/android/MyFirebaseMessagingService.java" target-dir="src/com/gae/scaffolder/plugin" />
<source-file src="src/android/MyFirebaseInstanceIDService.java" target-dir="src/com/gae/scaffolder/plugin" />
<source-file src="src/android/FCMPluginActivity.java" target-dir="src/com/gae/scaffolder/plugin" />
</platform>

<!-- IOS CONFIGURATION -->
<platform name="ios">
<config-file target="config.xml" parent="/*">
<feature name="FCMPlugin">
<param name="ios-package" value="FCMPlugin"/>
</feature>
</config-file>

</platform>
<!-- IOS CONFIGURATION -->
<platform name="ios">
<config-file target="config.xml" parent="/*">
<feature name="FCMPlugin">
<param name="ios-package" value="FCMPlugin"/>
</feature>
</config-file>
<!-- ENABLE PUSH CAPABILITY -->
<config-file parent="aps-environment" target="*/Entitlements-Debug.plist">
<string>development</string>
<string>development</string>
</config-file>
<config-file parent="aps-environment" target="*/Entitlements-Release.plist">
<string>production</string>
</config-file>

<resource-file src="src/ios/GoogleService-Info.plist" target="Resources/GoogleService-Info.plist" />

<header-file src="src/ios/FCMPlugin.h" />
<source-file src="src/ios/FCMPlugin.m" />

<header-file src="src/ios/FCMPlugin.h" />
<source-file src="src/ios/FCMPlugin.m" />
<header-file src="src/ios/AppDelegate+FCMPlugin.h" />
<source-file src="src/ios/AppDelegate+FCMPlugin.m" />

<!-- FIREBASE COCOA PODS (not for the moment)-->
<!-- <framework src="Firebase/Messaging" type="podspec" spec="~> 0"/> -->

<!-- FIREBASE LIBS -->
<header-file src="src/ios/firebase/Firebase.h" />
<framework src="src/ios/firebase/FirebaseAnalytics.framework" custom="true" />
Expand All @@ -113,18 +95,15 @@
<framework src="src/ios/firebase/GoogleIPhoneUtilities.framework" custom="true" />
<framework src="src/ios/firebase/GoogleSymbolUtilities.framework" custom="true" />
<framework src="src/ios/firebase/GoogleUtilities.framework" custom="true" />

<!-- OTHER NEEDED LIBS -->
<framework src="libc++.tbd" />
<framework src="libz.tbd" />
<framework src="AddressBook.framework" />
<framework src="libsqlite3.0.tbd" />
<framework src="libz.tbd" />
<framework src="Security.framework" />
</platform>

</platform>
<!-- COPY FCM CONFIG FILES TO PLATFORM AFTER PLUGIN INSTALL OR PLATFORM PREPARE -->
<hook src="scripts/fcm_config_files_process.js" type="after_plugin_add" />
<hook src="scripts/fcm_config_files_process.js" type="after_prepare" />

</plugin>
</plugin>
13 changes: 0 additions & 13 deletions src/android/FCMPlugin.gradle
View file
Open in desktop

This file was deleted.