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/09/24 03:12:24 UTC

[7/7] android commit: Merge branch 'master' into 4.0.x (gradle Android Studio)

Merge branch 'master' into 4.0.x (gradle Android Studio)


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

Branch: refs/heads/4.0.x
Commit: f7f49d27c5a962378cda472406e5ffd09c8a8d9c
Parents: 75a0a67 9e3ccf4
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 23 21:04:55 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 23 21:04:55 2014 -0400

----------------------------------------------------------------------
 bin/lib/create.js                     |  1 -
 bin/templates/cordova/lib/build.js    | 16 ++++++++++++++++
 bin/templates/project/build.gradle    | 23 +++++++----------------
 bin/templates/project/cordova.gradle  |  4 ++--
 bin/templates/project/settings.gradle | 18 ------------------
 5 files changed, 25 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f7f49d27/bin/lib/create.js
----------------------------------------------------------------------
diff --cc bin/lib/create.js
index fd962b4,bfe6b23..4fa600c
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@@ -119,9 -119,9 +119,8 @@@ function writeProjectProperties(project
  
  function copyBuildRules(projectPath) {
      var srcDir = path.join(ROOT, 'bin', 'templates', 'project');
 -    shell.cp('-f', path.join(srcDir, 'custom_rules.xml'), projectPath);
  
      shell.cp('-f', path.join(srcDir, 'build.gradle'), projectPath);
-     shell.cp('-f', path.join(srcDir, 'settings.gradle'), projectPath);
      shell.cp('-f', path.join(srcDir, 'cordova.gradle'), projectPath);
  }
  

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