From 48c4a56731f079474bca588af17702cd502f2a16 Mon Sep 17 00:00:00 2001
From: Cory Snyder <csnyder@iland.com>
Date: Tue, 16 Feb 2016 18:30:40 -0500
Subject: [PATCH] Use standard  cordova variable in place of applicationId

---
 plugin.xml  |  7 +++----
 push.gradle | 21 ---------------------
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 push.gradle

diff --git a/plugin.xml b/plugin.xml
index 30e6273f7..396c8ea40 100755
--- a/plugin.xml
+++ b/plugin.xml
@@ -40,8 +40,8 @@
 			<uses-permission android:name="android.permission.WAKE_LOCK" />
 			<uses-permission android:name="android.permission.VIBRATE"/>
 			<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-			<permission android:name="${applicationId}.permission.C2D_MESSAGE" android:protectionLevel="signature" />
-			<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
+			<permission android:name="$PACKAGE_NAME.permission.C2D_MESSAGE" android:protectionLevel="signature" />
+			<uses-permission android:name="$PACKAGE_NAME.permission.C2D_MESSAGE" />
 		</config-file>
 
 		<config-file target="AndroidManifest.xml" parent="/manifest/application">
@@ -53,7 +53,7 @@
                 android:permission="com.google.android.c2dm.permission.SEND" >
                 <intent-filter>
                     <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-                    <category android:name="${applicationId}" />
+                    <category android:name="$PACKAGE_NAME" />
                 </intent-filter>
             </receiver>
             <service
@@ -76,7 +76,6 @@
             </service>
 		</config-file>
 
-        <framework src="push.gradle" custom="true" type="gradleReference" />
         <framework src="com.android.support:support-v13:23+" />
         <framework src="com.google.android.gms:play-services-gcm:+" />
 
diff --git a/push.gradle b/push.gradle
deleted file mode 100644
index d61b60f59..000000000
--- a/push.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-import java.util.regex.Pattern
-
-def doExtractStringFromManifest(name) {
-    def manifestFile = file(android.sourceSets.main.manifest.srcFile)
-    def pattern = Pattern.compile(name + "=\"(.*?)\"")
-    def matcher = pattern.matcher(manifestFile.getText())
-    matcher.find()
-    return matcher.group(1)
-}
-
-android {
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-        }
-    }
-
-    defaultConfig {
-        applicationId = doExtractStringFromManifest("package")
-    }
-}
\ No newline at end of file