github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-11 00:00:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.0.x (Gradle env vars)

Browse Source
This commit is contained in:
Ian Clelland
2014-09-17 15:58:46 -04:00
parent c32bcca67b 7ce46ed60c
commit 215adab1f9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/templates/project/build.gradle
+1 -1
View File
@@ -57,7 +57,7 @@ android {
}
defaultConfig {
versionCode Integer.parseInt("" + getVersionCodeFromManifest() + "0")
versionCode Integer.parseInt(System.env.ANDROID_VERSION_CODE ?: ("" + getVersionCodeFromManifest() + "0"))
}
compileSdkVersion cordova.cordovaSdkVersion
bin/templates/project/cordova.gradle
+1 -1
View File
@@ -115,6 +115,6 @@ String getAndroidSdkDir() {
androidSdkDir
}
cordovaSdkVersion = getProjectTarget("android-19")
cordovaSdkVersion = System.env.MIN_SDK_VERSION ?: getProjectTarget("android-19")
cordovaBuildToolsVersion = latestBuildToolsAvailable("19.1.0")