Merge branch 'master' into 4.0.x (Gradle library dependencies)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/b2776269 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/b2776269 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/b2776269 Branch: refs/heads/4.0.x Commit: b2776269cf032ce48977e2f0933a3a24a99b4f05 Parents: 4c1942e b6c5a5f Author: Ian Clelland <[email protected]> Authored: Wed Aug 20 11:43:58 2014 -0400 Committer: Ian Clelland <[email protected]> Committed: Wed Aug 20 11:43:58 2014 -0400 ---------------------------------------------------------------------- bin/lib/android_sdk_version.js | 2 +- bin/lib/create.js | 1 - bin/templates/project/build.gradle | 16 ++++++++++++++-- bin/templates/project/libraries.gradle | 7 ------- bin/templates/project/settings.gradle | 19 ++++++++++++++++++- 5 files changed, 33 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/b2776269/bin/lib/create.js ----------------------------------------------------------------------
