From fb9cf60c4100d5bc6f9320747611da1ca0ced289 Mon Sep 17 00:00:00 2001
From: Darryl Pogue <darryl@ayogo.com>
Date: Mon, 21 Dec 2015 14:53:49 -0800
Subject: [PATCH] CB-10014: Set gradle applicationId to package name.

This closes 247
---
 bin/templates/project/build.gradle | 2 ++
 framework/cordova.gradle           | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index f540f693..157c4ee2 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -163,6 +163,8 @@ android {
 
     defaultConfig {
         versionCode cdvVersionCode ?: Integer.parseInt("" + privateHelpers.extractIntFromManifest("versionCode") + "0")
+        applicationId privateHelpers.extractStringFromManifest("package")
+
         if (cdvMinSdkVersion != null) {
             minSdkVersion cdvMinSdkVersion
         }
diff --git a/framework/cordova.gradle b/framework/cordova.gradle
index 6e89c4c2..74652667 100644
--- a/framework/cordova.gradle
+++ b/framework/cordova.gradle
@@ -128,6 +128,14 @@ def doExtractIntFromManifest(name) {
     return Integer.parseInt(matcher.group(1))
 }
 
+def doExtractStringFromManifest(name) {
+    def manifestFile = file(android.sourceSets.main.manifest.srcFile)
+    def pattern = Pattern.compile(name + "=\"(\\S+)\"")
+    def matcher = pattern.matcher(manifestFile.getText())
+    matcher.find()
+    return matcher.group(1)
+}
+
 def doPromptForPassword(msg) {
     if (System.console() == null) {
         def ret = null
@@ -179,6 +187,7 @@ ext {
     privateHelpers.getProjectTarget = { doGetProjectTarget() }
     privateHelpers.findLatestInstalledBuildTools = { doFindLatestInstalledBuildTools('19.1.0') }
     privateHelpers.extractIntFromManifest = { name -> doExtractIntFromManifest(name) }
+    privateHelpers.extractStringFromManifest = { name -> doExtractStringFromManifest(name) }
     privateHelpers.promptForPassword = { msg -> doPromptForPassword(msg) }
     privateHelpers.ensureValueExists = { filePath, props, key -> doEnsureValueExists(filePath, props, key) }