From e182e669f0aaee775a8e109be1676f35a358a72a Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Mon, 13 Mar 2017 12:49:46 -0700 Subject: [PATCH] CB-12524: Put the script in the wrong spot, oops This closes #367 --- bin/lib/create.js | 4 +--- wrapper.gradle => bin/templates/project/wrapper.gradle | 0 spec/e2e/update.spec.js | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) rename wrapper.gradle => bin/templates/project/wrapper.gradle (100%) diff --git a/bin/lib/create.js b/bin/lib/create.js index 75fec7c3..ef5827ac 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) { diff --git a/wrapper.gradle b/bin/templates/project/wrapper.gradle similarity index 100% rename from wrapper.gradle rename to bin/templates/project/wrapper.gradle diff --git a/spec/e2e/update.spec.js b/spec/e2e/update.spec.js index 2bf47170..cda100e4 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); }); });