mirror of
https://github.com/apache/cordova-android.git
synced 2025-03-16 08:21:04 +08:00
CB-10014: Set gradle applicationId to package name.
This closes 247
This commit is contained in:
parent
b6a329d479
commit
fb9cf60c41
@ -163,6 +163,8 @@ android {
|
|||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
versionCode cdvVersionCode ?: Integer.parseInt("" + privateHelpers.extractIntFromManifest("versionCode") + "0")
|
versionCode cdvVersionCode ?: Integer.parseInt("" + privateHelpers.extractIntFromManifest("versionCode") + "0")
|
||||||
|
applicationId privateHelpers.extractStringFromManifest("package")
|
||||||
|
|
||||||
if (cdvMinSdkVersion != null) {
|
if (cdvMinSdkVersion != null) {
|
||||||
minSdkVersion cdvMinSdkVersion
|
minSdkVersion cdvMinSdkVersion
|
||||||
}
|
}
|
||||||
|
@ -128,6 +128,14 @@ def doExtractIntFromManifest(name) {
|
|||||||
return Integer.parseInt(matcher.group(1))
|
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) {
|
def doPromptForPassword(msg) {
|
||||||
if (System.console() == null) {
|
if (System.console() == null) {
|
||||||
def ret = null
|
def ret = null
|
||||||
@ -179,6 +187,7 @@ ext {
|
|||||||
privateHelpers.getProjectTarget = { doGetProjectTarget() }
|
privateHelpers.getProjectTarget = { doGetProjectTarget() }
|
||||||
privateHelpers.findLatestInstalledBuildTools = { doFindLatestInstalledBuildTools('19.1.0') }
|
privateHelpers.findLatestInstalledBuildTools = { doFindLatestInstalledBuildTools('19.1.0') }
|
||||||
privateHelpers.extractIntFromManifest = { name -> doExtractIntFromManifest(name) }
|
privateHelpers.extractIntFromManifest = { name -> doExtractIntFromManifest(name) }
|
||||||
|
privateHelpers.extractStringFromManifest = { name -> doExtractStringFromManifest(name) }
|
||||||
privateHelpers.promptForPassword = { msg -> doPromptForPassword(msg) }
|
privateHelpers.promptForPassword = { msg -> doPromptForPassword(msg) }
|
||||||
privateHelpers.ensureValueExists = { filePath, props, key -> doEnsureValueExists(filePath, props, key) }
|
privateHelpers.ensureValueExists = { filePath, props, key -> doEnsureValueExists(filePath, props, key) }
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user