fix(ns-bundle): run gradlew clean instead of platform add/remove (#153)

fixes NativeScript/android#759

Author: sis0k0

Diff for: .npmignore

@@ -1 +1 @@
-template-generator
+prepublish

Diff for: bin/ns-bundle

@@ -2,6 +2,7 @@
 
 const { spawn } = require("child_process");
 const { resolve: pathResolve } = require("path");
+const { existsSync } = require("fs");
 const { getPackageJson } = require("../projectHelpers");
 
 const PROJECT_DIR = pathResolve(__dirname, "../../../");
@@ -16,11 +17,6 @@ const tnsArgs = getTnsArgs(npmArgs).map(escape);
 const flags = npmArgs.filter(a => a.startsWith("--")).map(a => a.substring(2));
 const options = getOptions(flags);
 
-let platformVersion;
-try {
-    platformVersion = packageJson.nativescript[`tns-${options.platform}`].version;
-} catch(e) {}
-
 function getTnsArgs(args) {
     const other = [
         "run",
@@ -44,24 +40,52 @@ execute(options);
 
 function execute(options) {
     let commands = [];
+    const platform = options.platform;
 
     if (options.bundle) {
-        commands.push(() => clearPlatform(options.platform));
-        commands.push(() => webpack(options.platform));
+        commands.push(() => cleanApp(platform));
+        commands.push(() => webpack(platform));
+    }
+
+    if (platform === "android") {
+        commands.push(() => gradlewClean());
     }
 
     // If "build-app" or "start-app" is specified,
     // the respective command should be run last.
     // Otherwise, the app should be just prepared.
     if (options.command) {
-        commands.push(() => runTns(options.command, options.platform));
+        commands.push(() => runTns(options.command, platform));
     } else {
-        commands.shift(() => runTns("prepare", options.platform))
+        commands.shift(() => runTns("prepare", platform))
     }
 
     return commands.reduce((current, next) => current.then(next), Promise.resolve());
 }
 
+// Clear platform/**/app folder contents
+function cleanApp(platform) {
+    return new Promise((resolve, reject) => {
+        spawnChildProcess(true, "tns", "clean-app", platform)
+            .then(resolve)
+            .catch(throwError)
+    });
+}
+
+function gradlewClean() {
+    return new Promise((resolve, reject) => {
+        const platformsPath = pathResolve(PROJECT_DIR, "platforms", "android")
+        const gradlew = pathResolve(platformsPath, "gradlew");
+        if (!existsSync(gradlew)) {
+            resolve();
+        }
+
+        spawnChildProcess(true, gradlew, "-p", platformsPath, "clean")
+            .then(resolve)
+            .catch(throwError);
+    });
+}
+
 function webpack(platform) {
     return new Promise(function (resolve, reject) {
         console.log(`Running webpack for ${platform}...`);
@@ -81,32 +105,6 @@ function webpack(platform) {
     });
 }
 
-function clearPlatform(platform) {
-    return removePlatform(platform)
-        .then(() => addPlatform(platform));
-}
-
-function removePlatform(platform) {
-    return new Promise(function (resolve, reject) {
-        console.log(`Removing platform ${platform}...`);
-
-        spawnChildProcess(false, "tns", "platform", "remove", platform)
-            .then(resolve)
-            .catch(resolve);
-    });
-}
-
-function addPlatform(platform) {
-    return new Promise(function (resolve, reject) {
-        const platformToAdd = platformVersion ? `${platform}@${platformVersion}` : platform;
-        console.log(`Adding platform ${platformToAdd}...`);
-
-        spawnChildProcess(false, "tns", "platform", "add", platformToAdd)
-            .then(resolve)
-            .catch(resolve);
-    });
-}
-
 function runTns(command, platform) {
     return new Promise((resolve, reject) => {
         console.log(`Running tns ${command}...`);