github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2024-10-06 17:42:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.0.x (--minSdkVersion and --versionCode)

Browse Source 
Conflicts:
	bin/templates/project/build.gradle
This commit is contained in:
Andrew Grieve 2014-12-24 13:35:17 -05:00
commit 4f3ae23170
2 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bin/templates/cordova/lib/build.js vendored
View File

@ -306,15 +306,21 @@ function parseOpts(options, resolvedTarget) {
// Iterate through command line options
for (var i=0; options && (i < options.length); ++i) {
if (/^--/.exec(options[i])) {
var option = options[i].substring(2);
switch(option) {
var keyValue = options[i].substring(2).split('=');
var flagName = keyValue[0];
var flagValue = keyValue[1];
if ((flagName == 'versionCode' || flagName == 'minSdkVersion') && !flagValue) {
flagValue = options[i + 1];
++i;
}
switch(flagName) {
case 'debug':
case 'release':
ret.buildType = option;
ret.buildType = flagName;
break;
case 'ant':
case 'gradle':
ret.buildMethod = option;
ret.buildMethod = flagName;
break;
case 'device':
case 'emulator':
@ -324,8 +330,14 @@ function parseOpts(options, resolvedTarget) {
case 'nobuild' :
ret.buildMethod = 'none';
break;
case 'versionCode':
process.env['ANDROID_VERSION_CODE'] = flagValue;
break;
case 'minSdkVersion':
process.env['ANDROID_MIN_SDK_VERSION'] = flagValue;
break;
default :
console.warn('Build option \'' + options[i] + '\' not recognized (ignoring).');
console.warn('Build option --\'' + flagName + '\' not recognized (ignoring).');
}
} else {
console.warn('Build option \'' + options[i] + '\' not recognized (ignoring).');
@ -445,12 +457,14 @@ module.exports.findBestApkForArchitecture = function(buildResults, arch) {
};
module.exports.help = function() {
console.log('Usage: ' + path.relative(process.cwd(), path.join(ROOT, 'cordova', 'build')) + ' [build_type]');
console.log('Build Types : ');
console.log(' \'--debug\': Default build, will build project in debug mode');
console.log('Usage: ' + path.relative(process.cwd(), path.join(ROOT, 'cordova', 'build')) + ' [flags]');
console.log('Flags:');
console.log(' \'--debug\': will build project in debug mode (default)');
console.log(' \'--release\': will build project for release');
console.log(' \'--ant\': Default build, will build project with ant');
console.log(' \'--gradle\': will build project with gradle');
console.log(' \'--nobuild\': will skip build process (can be used with run command)');
console.log(' \'--ant\': will build project with ant');
console.log(' \'--gradle\': will build project with gradle (default)');
console.log(' \'--nobuild\': will skip build process (useful when using run command)');
console.log(' \'--versionCode=#\': Override versionCode for this build. Useful for uploading multiple APKs. Requires --gradle.');
console.log(' \'--minSdkVersion=#\': Override minSdkVersion for this build. Useful for uploading multiple APKs. Requires --gradle.');
process.exit(0);
};

17
bin/templates/project/build.gradle
View File

@ -74,6 +74,9 @@ android {
defaultConfig {
versionCode Integer.parseInt(System.env.ANDROID_VERSION_CODE ?: ("" + getIntFromManifest("versionCode") + "0"))
if (System.env.ANDROID_MIN_SDK_VERSION) {
minSdkVersion Integer.parseInt(System.env.ANDROID_MIN_SDK_VERSION)
}
}
compileSdkVersion cordova.cordovaSdkVersion
@ -82,13 +85,13 @@ android {
if (multiarch || System.env.BUILD_MULTIPLE_APKS) {
productFlavors {
armv7 {
versionCode defaultConfig.versionCode + 2
versionCode System.env.ANDROID_VERSION_CODE ?: defaultConfig.versionCode + 2
ndk {
abiFilters "armeabi-v7a", ""
}
}
x86 {
versionCode defaultConfig.versionCode + 4
versionCode System.env.ANDROID_VERSION_CODE ?: defaultConfig.versionCode + 4
ndk {
abiFilters "x86", ""
}
@ -99,8 +102,16 @@ android {
}
}
}
} else if (getIntFromManifest("minSdkVersion") >= 20) {
} else if (!System.env.ANDROID_VERSION_CODE) {
def minSdkVersion = Integer.parseInt(System.env.ANDROID_MIN_SDK_VERSION ?: "" + getIntFromManifest("minSdkVersion"))
// Vary versionCode by the two most common API levels:
// 14 is ICS, which is the lowest API level for many apps.
// 20 is Lollipop, which is the lowest API level for the updatable system webview.
if (minSdkVersion >= 20) {
defaultConfig.versionCode += 9
} else if (minSdkVersion >= 14) {
defaultConfig.versionCode += 8
}
}
compileOptions {