Solved a couple Android build errors (#1383)

phonegap · Nov 28, 2016 · c9ef2e1 · c9ef2e1
1 parent ba91d13
commit c9ef2e1
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -67,8 +67,8 @@
 
         <framework src="push.gradle" custom="true" type="gradleReference" />
         <framework src="com.android.support:support-v13:23+" />
-        <framework src="com.google.firebase:firebase-messaging:9.0.0" />
         <framework src="me.leolin:ShortcutBadger:1.1.11@aar"/>
+        <framework src="com.google.firebase:firebase-messaging:9+" />
 
 		<source-file src="src/android/com/adobe/phonegap/push/GCMIntentService.java" target-dir="src/com/adobe/phonegap/push/" />
 		<source-file src="src/android/com/adobe/phonegap/push/PushConstants.java" target-dir="src/com/adobe/phonegap/push/" />
@@ -127,6 +127,4 @@
 	</platform>
 
     <hook src="scripts/copy_file.js" type="after_prepare" />
-
->>>>>>> Use CocoaPods
 </plugin>