You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by na...@apache.org on 2014/10/09 22:22:34 UTC
[02/19] git commit: CB-3445: Make minSdkVersion and base versionCode
settable through env vars
CB-3445: Make minSdkVersion and base versionCode settable through env vars
Project: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/commit/3f2397a0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/3f2397a0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/3f2397a0
Branch: refs/heads/master
Commit: 3f2397a0fdc2d1b4d415d5015446d43adfe9ba7c
Parents: 68a92ce
Author: Ian Clelland <ic...@chromium.org>
Authored: Wed Sep 17 15:54:28 2014 -0400
Committer: Prabhjot Singh <pr...@amazon.com>
Committed: Mon Oct 6 15:57:53 2014 +0530
----------------------------------------------------------------------
bin/templates/project/build.gradle | 2 +-
bin/templates/project/cordova.gradle | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/3f2397a0/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index 96ea009..b6994b6 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -57,7 +57,7 @@ android {
}
defaultConfig {
- versionCode Integer.parseInt("" + getVersionCodeFromManifest() + "0")
+ versionCode Integer.parseInt(System.env.ANDROID_VERSION_CODE ?: ("" + getVersionCodeFromManifest() + "0"))
}
compileSdkVersion cordova.cordovaSdkVersion
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/3f2397a0/bin/templates/project/cordova.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova.gradle b/bin/templates/project/cordova.gradle
index ba73c93..ec597b2 100644
--- a/bin/templates/project/cordova.gradle
+++ b/bin/templates/project/cordova.gradle
@@ -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")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org