cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [37/50] [abbrv] android commit: Merge branch 'master' into 4.0.x (gradle properties)
Date Wed, 28 Jan 2015 14:59:28 GMT
Merge branch 'master' into 4.0.x (gradle properties)

Conflicts:
	bin/templates/cordova/lib/build.js


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/2083f683
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/2083f683
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/2083f683

Branch: refs/heads/master
Commit: 2083f683ad6703f8cea86752b705bad346974555
Parents: df4fbc2 c3610aa
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Thu Jan 8 15:43:22 2015 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Thu Jan 8 15:43:22 2015 -0500

----------------------------------------------------------------------
 bin/templates/cordova/lib/build.js            |  36 +++++--
 bin/templates/cordova/lib/plugin-build.gradle |   4 +-
 bin/templates/cordova/lib/run.js              |  13 +--
 bin/templates/project/build.gradle            | 120 +++++++++++----------
 bin/templates/project/cordova.gradle          |  47 +++++++-
 framework/build.gradle                        |   4 +-
 6 files changed, 139 insertions(+), 85 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2083f683/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --cc bin/templates/cordova/lib/build.js
index 9c4839d,5ad3e76..300d675
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@@ -301,8 -304,15 +304,15 @@@ function parseOpts(options, resolvedTar
  
      var ret = {
          buildType: 'debug',
 -        buildMethod: process.env['ANDROID_BUILD'] || 'ant',
 +        buildMethod: process.env['ANDROID_BUILD'] || 'gradle',
-         arch: null
+         arch: null,
+         extraArgs: []
+     };
+ 
+     var multiValueArgs = {
+       'versionCode': true,
+       'minSdkVersion': true,
+       'gradleArg': true
      };
  
      // Iterate through command line options


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message