You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/12/31 05:01:08 UTC

[05/12] android commit: Merge branch 'master' into 4.0.x (gradle - maven and CordovaLib dep)

Merge branch 'master' into 4.0.x (gradle - maven and CordovaLib dep)


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

Branch: refs/heads/4.0.x
Commit: 5a17d6cd5f20252338334208bc8e0d68e3a32716
Parents: 4f3ae23 480af26
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Dec 30 22:59:50 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Dec 30 22:59:50 2014 -0500

----------------------------------------------------------------------
 bin/templates/cordova/lib/build.js            |  4 +++-
 bin/templates/cordova/lib/plugin-build.gradle | 20 ++++++++++++++--
 bin/templates/project/build.gradle            |  5 ++++
 framework/build.gradle                        | 27 ++++++++++++++--------
 4 files changed, 43 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/5a17d6cd/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------


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