Integrate the latest changes from the common lib

teobugslayer · teobugslayer · commit 7457fed2a8bc · 2015-01-09T18:43:29.000+02:00
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit 2b1e60abcf9b918bac1f8c47f0046dfa7171ff20
+Subproject commit e19cd4381971662dcbf61bf8c8ed2e7f3b57231c
diff --git a/lib/config.ts b/lib/config.ts
@@ -21,5 +21,9 @@ export class StaticConfig implements IStaticConfig {
 	public get adbFilePath(): string {
 		return path.join(__dirname, util.format("../resources/platform-tools/android/%s/adb", process.platform));
 	}
+
+	public get sevenZipFilePath() {
+		return path.join(__dirname, util.format("../resources/platform-tools/unzip/%s/7za", process.platform));
+	}
 }
 $injector.register("staticConfig", StaticConfig);
diff --git a/lib/options.ts b/lib/options.ts
@@ -1,4 +1,5 @@
 ///<reference path=".d.ts"/>
+"use strict";
 
 import path = require("path");
 import helpers = require("./common/helpers");
@@ -34,7 +35,7 @@ if(hostInfo.isWindows()) {
 }
 
 commonOptions.setProfileDir(defaultProfileDir);
-var parsed = helpers.getParsedOptions(knownOpts, shorthands);
+var parsed = helpers.getParsedOptions(knownOpts, shorthands, "nativescript");
 
 Object.keys(parsed).forEach((opt) => exports[opt] = parsed[opt]);
 exports.knownOpts = knownOpts;
diff --git a/lib/services/emulator-settings-service.ts b/lib/services/emulator-settings-service.ts
@@ -1,4 +1,5 @@
 ///<reference path="../.d.ts"/>
+"use strict";
 
 export class EmulatorSettingsService implements Mobile.IEmulatorSettingsService {
 	private static REQURED_ANDROID_APILEVEL = 17;
diff --git a/package.json b/package.json
@@ -31,6 +31,7 @@
     "filesize": "2.0.3",
     "iconv-lite": "0.4.4",
     "lockfile": "1.0.0",
+    "lodash": "2.4.1",
     "log4js": "0.6.9",
     "mkdirp": "0.3.5",
     "mute-stream": "0.0.4",
@@ -48,7 +49,6 @@
     "shelljs": "0.3.0",
     "tabtab": "https://github.com/Icenium/node-tabtab/tarball/master",
     "temp": "0.8.1",
-    "underscore": "1.5.2",
     "unzip": "0.1.9",
     "watchr": "2.4.11",
     "xmlhttprequest": "https://github.com/telerik/node-XMLHttpRequest/tarball/master",
diff --git a/resources/platform-tools/unzip/win32/7za.dll b/resources/platform-tools/unzip/win32/7za.dll
diff --git a/resources/platform-tools/unzip/win32/7za.exe b/resources/platform-tools/unzip/win32/7za.exe
diff --git a/resources/platform-tools/unzip/win32/7zxa.dll b/resources/platform-tools/unzip/win32/7zxa.dll
diff --git a/test/test-bootstrap.ts b/test/test-bootstrap.ts
@@ -1,4 +1,4 @@
-global._ = require("underscore");
+global._ = require("lodash");
 global.$injector = require("../lib/common/yok").injector;
 
 $injector.register("analyticsService", {

Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,9 @@ export class StaticConfig implements IStaticConfig {`
`21`	`21`	`public get adbFilePath(): string {`
`22`	`22`	`return path.join(__dirname, util.format("../resources/platform-tools/android/%s/adb", process.platform));`
`23`	`23`	`}`
	`24`	`+`
	`25`	`+ public get sevenZipFilePath() {`
	`26`	`+ return path.join(__dirname, util.format("../resources/platform-tools/unzip/%s/7za", process.platform));`
	`27`	`+ }`
`24`	`28`	`}`
`25`	`29`	`$injector.register("staticConfig", StaticConfig);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`///<reference path="../.d.ts"/>`
	`2`	`+"use strict";`
`2`	`3`
`3`	`4`	`export class EmulatorSettingsService implements Mobile.IEmulatorSettingsService {`
`4`	`5`	`private static REQURED_ANDROID_APILEVEL = 17;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-global._ = require("underscore");`
	`1`	`+global._ = require("lodash");`
`2`	`2`	`global.$injector = require("../lib/common/yok").injector;`
`3`	`3`
`4`	`4`	`$injector.register("analyticsService", {`