Update production with master to update the setup scripts

.travis.yml

@@ -8,12 +8,16 @@ node_js:
 - '6'
 git:
   submodules: true
+install:
+- npm install --ignore-scripts
 before_script:
+- gem install xcodeproj
+- gem install cocoapods
 - npm install grunt
 - node_modules/.bin/grunt enableScripts:false
 - grunt rebuild
-- ./bin/nativescript error-reporting disable # force ~/.local dir creation -- some tests rely on it
-- ./bin/nativescript usage-reporting disable
+- "./bin/nativescript error-reporting disable"
+- "./bin/nativescript usage-reporting disable"
 - npm test
 - node_modules/.bin/grunt enableScripts:true
 script:
@@ -26,27 +30,27 @@ after_success:
 before_deploy:
 - node .travis/add-publishConfig.js $TRAVIS_BRANCH
 deploy:
-  - provider: s3
-    bucket: nativescript-ci
-    access_key_id: AKIAIYSWYOZRFLVKPCTQ
-    secret_access_key:
-      secure: THGlblH9XdRcTQMc3jm4kpwCB3myl8MGB3v9XjB5ObK4gqxUxuPi6e158LEG9Dgb730MGEYtaAjc9OneH59WAjQOrdcf3GXiGKOiCYzGYZLqVE4pjNDuxHaVGOj7mso4TzMinMCaDSQajTvadCfVmXqgT6p9eSXkiV3V2d2DN6c=
-    skip_cleanup: true
-    local-dir: s3-publish
-    upload-dir: build_result
-    on:
-      branch: master
-  - provider: npm
-    skip_cleanup: true
-    email: nativescript@telerik.com
-    on:
-      branch: master
-    api_key:
-      secure: KzzsvF3eA3j4gRQa8tO//+XWNSR3XiX8Sa18o3PyKyG9/cBZ6PQ3Te74cNS1C3ZiLUOgs5dWA6/TmRVPci4XjvFaWo/B6e2fuVSl5H94Od99bkeBHJsbLSEkLN4ClV/YbGuyKgA5Q2yIFt6p2EJjL90RjbbIk7I4YuyG2Mo3j0Q=
-  - provider: npm
-    skip_cleanup: true
-    email: nativescript@telerik.com
-    on:
-      branch: release
-    api_key:
-      secure: KzzsvF3eA3j4gRQa8tO//+XWNSR3XiX8Sa18o3PyKyG9/cBZ6PQ3Te74cNS1C3ZiLUOgs5dWA6/TmRVPci4XjvFaWo/B6e2fuVSl5H94Od99bkeBHJsbLSEkLN4ClV/YbGuyKgA5Q2yIFt6p2EJjL90RjbbIk7I4YuyG2Mo3j0Q=
+- provider: s3
+  access_key_id: AKIAJL6X6724CSX64X3Q
+  secret_access_key:
+    secure: a0T/2S+/rkRJqEotWPAr1VELA3k5TGyRw6VmXgBQnkirc6H0Pfu0P2DY8iriO7pnTPDCPAskdBCuk6t+RYw/OCrGDzFPApnAQ7t3tksKPr2bGYqh2HVqbFKZyEbNjzwsgxn7cmLPo936ZTHP2muQItEI3o9Zh9EZ5XHtv0Maw0k=
+  bucket: nativescript-ci
+  skip_cleanup: true
+  local-dir: s3-publish
+  upload-dir: build_result
+  on:
+    branch: master
+- provider: npm
+  skip_cleanup: true
+  email: nativescript@telerik.com
+  on:
+    branch: master
+  api_key:
+    secure: "g7Bpo7zX9kHaX8BcrnT/6S9/uuscAb2t+5Zr6okHCTaJXuLGOvzeV9KLFRyKKn93/o6sPlRIVA9welsYhUhdIlOUKz3jlPzejoaURhEY3xFrDWX29beho1Q88/AM5idGtosyElxvpw435WYeu/JlAu3DoYtCQavNXeEz5dY8cY0="
+- provider: npm
+  skip_cleanup: true
+  email: nativescript@telerik.com
+  on:
+    branch: release
+  api_key:
+    secure: "g7Bpo7zX9kHaX8BcrnT/6S9/uuscAb2t+5Zr6okHCTaJXuLGOvzeV9KLFRyKKn93/o6sPlRIVA9welsYhUhdIlOUKz3jlPzejoaURhEY3xFrDWX29beho1Q88/AM5idGtosyElxvpw435WYeu/JlAu3DoYtCQavNXeEz5dY8cY0="

.travis/add-publishConfig.js

@@ -1,25 +1,21 @@
 #!/usr/bin/env node
 
-var fsModule = require("fs");
+const fsModule = require("fs");
+const path = "./package.json";
+const fileOptions = {encoding: "utf-8"};
+const content = fsModule.readFileSync(path, fileOptions);
 
-// Adds a publishConfig section to the package.json file
-// and sets a tag to it
-
-var path = "./package.json";
-var fileOptions = {encoding: "utf-8"};
-var content = fsModule.readFileSync(path, fileOptions);
-
-var packageDef = JSON.parse(content);
+const packageDef = JSON.parse(content);
 if (!packageDef.publishConfig) {
     packageDef.publishConfig = {};
 }
 
-var branch = process.argv[2];
+const branch = process.argv[2];
 if (!branch) {
     console.log("Please pass the branch name as an argument!");
     process.exit(1);
 }
 packageDef.publishConfig.tag = branch === "release" ? "rc" : "next";
 
-var newContent = JSON.stringify(packageDef, null, "  ");
+const newContent = JSON.stringify(packageDef, null, "  ");
 fsModule.writeFileSync(path, newContent, fileOptions);

.vscode/launch.json

@@ -67,8 +67,19 @@
 		{
 			"type": "node",
 			"request": "attach",
-			"name": "Attach to Process",
-			"port": 5858,
+			"name": "Attach to Broker Process",
+			// In case you want to debug Analytics Broker process, add `--debug-brk=9897` (or --inspect-brk=9897) when spawning analytics-broker-process.
+			"port": 9897,
+			"sourceMaps": true
+		},
+
+		{
+			"type": "node",
+			"request": "attach",
+			"name": "Attach to Eqatec Process",
+			// In case you want to debug Eqatec Analytics process, add `--debug-brk=9855` (or --inspect-brk=9855) when spawning eqatec-analytics-process.
+			// NOTE: Ensure you set it only for one of the analytics processes.
+			"port": 9855,
 			"sourceMaps": true
 		}
 

Gruntfile.js

@@ -1,8 +1,9 @@
-var now = new Date().toISOString();
+const childProcess = require("child_process");
+const now = new Date().toISOString();
 
 function shallowCopy(obj) {
 	var result = {};
-	Object.keys(obj).forEach(function(key) {
+	Object.keys(obj).forEach(function (key) {
 		result[key] = obj[key];
 	});
 	return result;
@@ -11,10 +12,10 @@ function shallowCopy(obj) {
 var travis = process.env["TRAVIS"];
 var buildNumber = process.env["PACKAGE_VERSION"] || process.env["BUILD_NUMBER"] || "non-ci";
 
-module.exports = function(grunt) {
+module.exports = function (grunt) {
 	var path = require("path");
 	var commonLibNodeModules = path.join("lib", "common", "node_modules");
-	if(require("fs").existsSync(commonLibNodeModules)) {
+	if (require("fs").existsSync(commonLibNodeModules)) {
 		grunt.file.delete(commonLibNodeModules);
 	}
 	grunt.file.write(path.join("lib", "common", ".d.ts"), "");
@@ -50,17 +51,6 @@ module.exports = function(grunt) {
 			},
 		},
 
-		tslint: {
-			build: {
-				files: {
-					src: ["lib/**/*.ts", "test/**/*.ts", "!lib/common/node_modules/**/*.ts", "!lib/common/messages/**/*.ts", "lib/common/test/unit-tests/**/*.ts", "definitions/**/*.ts", "!lib/**/*.d.ts" , "!test/**/*.d.ts"]
-				},
-				options: {
-					configuration: grunt.file.readJSON("./tslint.json")
-				}
-			}
-		},
-
 		watch: {
 			devall: {
 				files: ["lib/**/*.ts", 'test/**/*.ts', "!lib/common/node_modules/**/*.ts", "!lib/common/messages/**/*.ts"],
@@ -96,7 +86,7 @@ module.exports = function(grunt) {
 				command: "npm pack",
 				options: {
 					execOptions: {
-						env: (function() {
+						env: (function () {
 							var env = shallowCopy(process.env);
 							env["NATIVESCRIPT_SKIP_POSTINSTALL_TASKS"] = "1";
 							return env;
@@ -143,9 +133,8 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks("grunt-contrib-watch");
 	grunt.loadNpmTasks("grunt-shell");
 	grunt.loadNpmTasks("grunt-ts");
-	grunt.loadNpmTasks("grunt-tslint");
 
-	grunt.registerTask("set_package_version", function(version) {
+	grunt.registerTask("set_package_version", function (version) {
 		var buildVersion = version !== undefined ? version : buildNumber;
 		if (process.env["BUILD_CAUSE_GHPRBCAUSE"]) {
 			buildVersion = "PR" + buildVersion;
@@ -154,16 +143,20 @@ module.exports = function(grunt) {
 		var packageJson = grunt.file.readJSON("package.json");
 		var versionParts = packageJson.version.split("-");
 		if (process.env["RELEASE_BUILD"]) {
-// HACK - excluded until 1.0.0 release or we refactor our project infrastructure (whichever comes first)
-//			packageJson.version = versionParts[0];
+			// HACK - excluded until 1.0.0 release or we refactor our project infrastructure (whichever comes first)
+			//			packageJson.version = versionParts[0];
 		} else {
 			versionParts[1] = buildVersion;
 			packageJson.version = versionParts.join("-");
 		}
 		grunt.file.write("package.json", JSON.stringify(packageJson, null, "  "));
 	});
 
-	grunt.registerTask("enableScripts", function(enable) {
+	grunt.registerTask("tslint:build", function (version) {
+		childProcess.execSync("npm run tslint", { stdio: "inherit" });
+	});
+
+	grunt.registerTask("enableScripts", function (enable) {
 		var enableTester = /false/i;
 		var newScriptsAttr = !enableTester.test(enable) ? "scripts" : "skippedScripts";
 		var packageJson = grunt.file.readJSON("package.json");

LICENSE

@@ -186,7 +186,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2015-2016 Telerik AD
+   Copyright (c) 2015-2017 Telerik AD
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@ Apache License
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.