Merge pull request #801 from NativeScript/totev/release-master

Merge {N} 1.2.3 release into Master

Author: teobugslayer

lib/common

@@ -199,6 +199,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 
 	private parseProjectProperties(projDir: string, destDir: string): IFuture<void> { // projDir is libraryPath, targetPath is the path to lib folder
 		return (() => {
+			projDir = projDir.trim();
 			let projProp = path.join(projDir, "project.properties");
 			if (!this.$fs.exists(projProp).wait()) {
 				this.$logger.warn("Warning: File %s does not exist", projProp);

lib/services/android-project-service.ts

@@ -189,7 +189,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
 			var umbrellaHeader = this.getUmbrellaHeaderFromDynamicFramework(libraryPath).wait();
 
 			let frameworkName = path.basename(libraryPath, path.extname(libraryPath));
-			let targetPath = path.join("lib", this.platformData.normalizedPlatformName, frameworkName);
+			let targetPath = path.join("lib", this.platformData.normalizedPlatformName);
 			let fullTargetPath = path.join(this.$projectData.projectDir, targetPath);
 			this.$fs.ensureDirectoryExists(fullTargetPath).wait();
 			shell.cp("-R", libraryPath, fullTargetPath);
@@ -280,7 +280,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
 
 	private getFrameworkRelativePath(libraryPath: string): string {
 		let frameworkName = path.basename(libraryPath, path.extname(libraryPath));
-		let targetPath = path.join("lib", this.platformData.normalizedPlatformName, frameworkName);
+		let targetPath = path.join("lib", this.platformData.normalizedPlatformName);
 		let frameworkPath = path.relative("platforms/ios", path.join(targetPath, frameworkName + ".framework"));
 		return frameworkPath;
 	}
@@ -380,4 +380,4 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
 		}).future<void>()();
 	}
 }
-$injector.register("iOSProjectService", IOSProjectService);
+$injector.register("iOSProjectService", IOSProjectService);

lib/services/ios-project-service.ts

@@ -87,6 +87,10 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer
 				}).future<string>()();
 			}
 
+			let iOSSimulatorRelativeToProjectBasePathAction = (projectFile: string): string => {
+				return path.join(constants.APP_FOLDER_NAME, path.dirname(projectFile.split(`/${constants.APP_FOLDER_NAME}/`)[1]));
+			}
+			
 			let watchGlob = path.join(this.$projectData.projectDir, constants.APP_FOLDER_NAME);
 
 			let platformSpecificLiveSyncServices: IDictionary<any> = {
@@ -96,7 +100,20 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer
 
 			let localProjectRootPath = platform.toLowerCase() === "ios" ? platformData.appDestinationDirectoryPath : null;
 
-			this.sync(platform, this.$projectData.projectId, projectFilesPath, this.excludedProjectDirsAndFiles, watchGlob, platformSpecificLiveSyncServices, restartAppOnDeviceAction, notInstalledAppOnDeviceAction, notRunningiOSSimulatorAction, localProjectRootPath, beforeLiveSyncAction, beforeBatchLiveSyncAction).wait();
+			this.sync(platform, 
+				this.$projectData.projectId, 
+				projectFilesPath, 
+				this.excludedProjectDirsAndFiles, 
+				watchGlob, 
+				platformSpecificLiveSyncServices, 
+				restartAppOnDeviceAction, 
+				notInstalledAppOnDeviceAction, 
+				notRunningiOSSimulatorAction, 
+				localProjectRootPath, 
+				beforeLiveSyncAction, 
+				beforeBatchLiveSyncAction, 
+				iOSSimulatorRelativeToProjectBasePathAction
+			).wait();
 		}).future<void>()();
 	}
 

lib/services/usb-livesync-service.ts

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "1.2.2",
+  "version": "1.2.3",
   "author": "Telerik <support@telerik.com>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {