github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-04-23 00:00:09 +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
parent a696ff37f1 7cfb33d0ef
commit 4f3ae23170
2 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/templates/project/build.gradle
+14 -3
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 {