Merge branch 'master' into TIMOB-26866

tidev · Mar 5, 2019 · e9321c3 · e9321c3
2 parents ea2dc28 + 480d2dc
commit e9321c3
Show file tree

Hide file tree

Showing 6 changed files with 455 additions and 724 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -18,7 +18,7 @@
     {
       "files": [ "tests/Resources/es6.*.js" ],
       "parserOptions": {
-        "ecmaVersion": 2015,
+        "ecmaVersion": 2017,
         "sourceType": "module"
       }
     },

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -126,7 +126,6 @@ module.exports = function (grunt) {
 	grunt.registerMultiTask('checkFormat', 'Validates the source code formatting.', validateFormatting);
 
 	// Load grunt plugins for modules
-	grunt.loadNpmTasks('grunt-mocha-test');
 	grunt.loadNpmTasks('grunt-appc-js');
 	grunt.loadNpmTasks('grunt-clang-format');
 	grunt.loadNpmTasks('grunt-contrib-clean');

diff --git a/build/utils.js b/build/utils.js
@@ -260,13 +260,17 @@ Utils.installSDK = async function (versionTag, symlinkIfPossible = false) {
 	}
 
 	const destDir = path.join(dest, 'mobilesdk', osName, versionTag);
-	const destStats = fs.lstatSync(destDir);
-	if (destStats.isDirectory()) {
-		console.log('Destination exists, deleting %s...', destDir);
-		await fs.remove(destDir);
-	} else if (destStats.isSymbolicLink()) {
-		console.log('Destination exists as symlink, unlinking %s...', destDir);
-		fs.unlinkSync(destDir);
+	try {
+		const destStats = fs.lstatSync(destDir);
+		if (destStats.isDirectory()) {
+			console.log('Destination exists, deleting %s...', destDir);
+			await fs.remove(destDir);
+		} else if (destStats.isSymbolicLink()) {
+			console.log('Destination exists as symlink, unlinking %s...', destDir);
+			fs.unlinkSync(destDir);
+		}
+	} catch (error) {
+		// Do nothing
 	}
 
 	const zipDir = path.join(__dirname, '..', 'dist', `mobilesdk-${versionTag}-${osName}`);