From 479eca2a4c17332efa37532aa8b0dc17a4d7b17b Mon Sep 17 00:00:00 2001
From: OctoD <iamoctod@gmail.com>
Date: Tue, 18 Jul 2017 14:27:08 +0200
Subject: [PATCH] chore: Fixes build system.

---
 .gulp/tasks/icons-variants.ts |  2 +-
 .gulp/tasks/icons.ts          |  2 +-
 .gulp/tasks/themes.ts         |  2 +-
 .vscode/tasks.json            | 18 ++++++------------
 extensions/helpers/fs.ts      |  2 +-
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.gulp/tasks/icons-variants.ts b/.gulp/tasks/icons-variants.ts
index a70e0cd..8d4ade4 100644
--- a/.gulp/tasks/icons-variants.ts
+++ b/.gulp/tasks/icons-variants.ts
@@ -22,7 +22,7 @@ function writeIconVariant(filepath: string, destpath: string, colour: string): v
 
   filepath = path.join(process.cwd(), PATHS.ICONS, filepath);
   destpath = path.join(process.cwd(), PATHS.ICONS, destpath);
-  fs.writeFileSync(destpath, fs.readFileSync(filepath, CHARSET).replace(regexp, ($0, $1) => $0.replace($1, colour)), CHARSET) ;
+  fs.writeFileSync(destpath, fs.readFileSync(filepath, CHARSET).replace(regexp, ($0, $1) => $0.replace($1, colour)), { encoding: CHARSET }) ;
 }
 
 
diff --git a/.gulp/tasks/icons.ts b/.gulp/tasks/icons.ts
index f640008..4da67f5 100644
--- a/.gulp/tasks/icons.ts
+++ b/.gulp/tasks/icons.ts
@@ -55,7 +55,7 @@ export default gulp.task('build:icons', cb => {
     return;
   }
 
-  fs.writeFileSync(pathTemp, contents, CHARSET);
+  fs.writeFileSync(pathTemp, contents, { encoding: CHARSET });
 
   gutil.log(gutil.colors.gray(HR));
   gutil.log(MESSAGE_GENERATED, gutil.colors.green(pathTemp));
diff --git a/.gulp/tasks/themes.ts b/.gulp/tasks/themes.ts
index 34d5c84..2c6d463 100644
--- a/.gulp/tasks/themes.ts
+++ b/.gulp/tasks/themes.ts
@@ -43,7 +43,7 @@ export default gulp.task('build:themes', () => {
     let templateJSON: any = JSON.parse(mustache.render(themeTemplateFileContent, templateData));
     let templateJSONStringified: string = JSON.stringify(templateJSON, null, 2);
 
-    fs.writeFileSync(filePath, templateJSONStringified, CHARSET);
+    fs.writeFileSync(filePath, templateJSONStringified, { encoding: CHARSET });
 
     gulpUtil.log(MESSAGE_GENERATED, gulpUtil.colors.green(filePath));
   });
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index a4f04a3..97c75a8 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -15,12 +15,13 @@
         "run",
         "build"
       ],
-      "isBuildCommand": true,
       "command": "npm",
       "dependsOn": "tsc",
-      "echoCommand": true,
-      "isShellCommand": true,
       "taskName": "build",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
       "problemMatcher": []
     },
     {
@@ -42,8 +43,7 @@
           "f",
           "-delete"
         ],
-        "command": "find",
-        "isShellCommand": true
+        "command": "find"
       },
       "osx": {
         "args": [
@@ -63,11 +63,9 @@
           "f",
           "-delete"
         ],
-        "command": "find",
-        "isShellCommand": true
+        "command": "find"
       },
       "command": "",
-      "echoCommand": true,
       "taskName": "clean project"
     },
     {
@@ -76,8 +74,6 @@
         "changelog"
       ],
       "command": "npm",
-      "echoCommand": true,
-      "isShellCommand": true,
       "taskName": "changelog"
     },
     {
@@ -87,8 +83,6 @@
       ],
       "command": "tsc",
       "dependsOn": "clean project",
-      "echoCommand": true,
-      "isShellCommand": true,
       "taskName": "tsc"
     }
   ]
diff --git a/extensions/helpers/fs.ts b/extensions/helpers/fs.ts
index ee422b3..80ac540 100644
--- a/extensions/helpers/fs.ts
+++ b/extensions/helpers/fs.ts
@@ -76,5 +76,5 @@ export function getPackageJSON(): IPackageJSON {
 export function writeFile(filename: string, filecontent: string): void {
   filename = path.join(PATHS.VSIX_DIR, filename);
   console.log(arguments)
-  fs.writeFileSync(filename, filecontent, CHARSET);
+  fs.writeFileSync(filename, filecontent, { encoding: CHARSET });
 }
\ No newline at end of file