You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2017/03/13 20:51:49 UTC
[06/10] android commit: CB-12524: Put the script in the wrong spot,
oops
CB-12524: Put the script in the wrong spot, oops
This closes #367
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e182e669
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e182e669
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e182e669
Branch: refs/heads/master
Commit: e182e669f0aaee775a8e109be1676f35a358a72a
Parents: a9a28d3
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Mar 13 12:49:46 2017 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Mar 13 13:51:37 2017 -0700
----------------------------------------------------------------------
bin/lib/create.js | 4 +---
bin/templates/project/wrapper.gradle | 1 +
spec/e2e/update.spec.js | 2 +-
wrapper.gradle | 1 -
4 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e182e669/bin/lib/create.js
----------------------------------------------------------------------
diff --git a/bin/lib/create.js b/bin/lib/create.js
index 75fec7c..ef5827a 100755
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -87,9 +87,6 @@ function copyJsAndLibrary(projectPath, shared, projectName) {
shell.cp('-f', path.join(ROOT, 'framework', 'build.gradle'), nestedCordovaLibPath);
shell.cp('-f', path.join(ROOT, 'framework', 'cordova.gradle'), nestedCordovaLibPath);
shell.cp('-r', path.join(ROOT, 'framework', 'src'), nestedCordovaLibPath);
- shell.cp('-f', path.join(ROOT, 'framework', 'gradlew'), nestedCordovaLibPath);
- shell.cp('-r', path.join(ROOT, 'framework', 'gradle'), nestedCordovaLibPath);
-
}
}
@@ -137,6 +134,7 @@ function copyBuildRules(projectPath) {
var srcDir = path.join(ROOT, 'bin', 'templates', 'project');
shell.cp('-f', path.join(srcDir, 'build.gradle'), projectPath);
+ shell.cp('-f', path.join(srcDir, 'wrapper.gradle'), projectPath);
}
function copyScripts(projectPath) {
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e182e669/bin/templates/project/wrapper.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/wrapper.gradle b/bin/templates/project/wrapper.gradle
new file mode 100644
index 0000000..d7ebabd
--- /dev/null
+++ b/bin/templates/project/wrapper.gradle
@@ -0,0 +1 @@
+//This file is intentionally just a comment
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e182e669/spec/e2e/update.spec.js
----------------------------------------------------------------------
diff --git a/spec/e2e/update.spec.js b/spec/e2e/update.spec.js
index 2bf4717..cda100e 100644
--- a/spec/e2e/update.spec.js
+++ b/spec/e2e/update.spec.js
@@ -83,7 +83,7 @@ describe('update', function() {
describe('cleanup', function () {
it('Test#004 : remove cloned old platform', function() {
- //shell.rm('-rf', platformOld.path);
+ shell.rm('-rf', platformOld.path);
});
});
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e182e669/wrapper.gradle
----------------------------------------------------------------------
diff --git a/wrapper.gradle b/wrapper.gradle
deleted file mode 100644
index d7ebabd..0000000
--- a/wrapper.gradle
+++ /dev/null
@@ -1 +0,0 @@
-//This file is intentionally just a comment
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org