chore: fix PR comments

Author: Fatme

lib/services/android-project-service.ts

@@ -348,9 +348,9 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		return nativescript && (nativescript.android || (nativescript.platforms && nativescript.platforms.android));
 	}
 
-	public async stopServices(platformData: IPlatformData): Promise<ISpawnResult> {
+	public async stopServices(projectRoot: string): Promise<ISpawnResult> {
 		const result = await this.$gradleCommandService.executeCommand(["--stop", "--quiet"], {
-			cwd: platformData.projectRoot,
+			cwd: projectRoot,
 			message: "Gradle stop services...",
 			stdio: "pipe"
 		});

lib/services/ios-project-service.ts

@@ -210,7 +210,6 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 				this.$xcodebuildService.buildForSimulator(platformData, projectData, buildConfig));
 		}
 
-		// TODO: Check if we need to validate the identifier here
 		this.validateApplicationIdentifier(projectData);
 	}
 

lib/services/ios/export-options-plist-service.ts

@@ -41,7 +41,7 @@ export class ExportOptionsPlistService implements IExportOptionsPlistService {
 		return { exportFileDir, exportFilePath, exportOptionsPlistFilePath };
 	}
 
-	public createDistributionExportOptionsPlist(projectRoot: string, projectData: IProjectData, buildConfig: IBuildConfig): IExportOptionsPlistOutput {
+	public createDistributionExportOptionsPlist(archivePath: string, projectData: IProjectData, buildConfig: IBuildConfig): IExportOptionsPlistOutput {
 		const provision = buildConfig.provision || buildConfig.mobileProvisionIdentifier;
 		const teamId = buildConfig.teamId;
 		let plistTemplate = `<?xml version="1.0" encoding="UTF-8"?>
@@ -77,7 +77,7 @@ export class ExportOptionsPlistService implements IExportOptionsPlistService {
 		const exportOptionsPlistFilePath = temp.path({ prefix: "export-", suffix: ".plist" });
 		this.$fs.writeFile(exportOptionsPlistFilePath, plistTemplate);
 
-		const exportFileDir = path.resolve(path.join(projectRoot, "/build/archive"));
+		const exportFileDir = path.resolve(path.dirname(archivePath));
 		const exportFilePath = path.join(exportFileDir, projectData.projectName + ".ipa");
 
 		return { exportFileDir, exportFilePath, exportOptionsPlistFilePath };

lib/services/ios/xcodebuild-command-service.ts

@@ -8,10 +8,10 @@ export class XcodebuildCommandService implements IXcodebuildCommandService {
 	) { }
 
 	public async executeCommand(args: string[], options: { cwd: string, stdio: string, message?: string, spawnOptions?: any }): Promise<ISpawnResult> {
-		const { message, cwd, stdio = "inherit", spawnOptions } = options;
+		const { message, cwd, stdio, spawnOptions } = options;
 		this.$logger.info(message || "Xcode build...");
 
-		const childProcessOptions = { cwd, stdio };
+		const childProcessOptions = { cwd, stdio: stdio || "inherit" };
 
 		try {
 			const commandResult = await this.$childProcess.spawnFromEvent("xcodebuild",

lib/services/platform-service.ts

@@ -694,7 +694,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 			let errorMessage;
 
 			try {
-				await platformData.platformProjectService.stopServices(platformData);
+				await platformData.platformProjectService.stopServices(platformData.projectRoot);
 			} catch (err) {
 				errorMessage = err.message;
 			}

test/tns-appstore-upload.ts

@@ -64,7 +64,7 @@ class AppStore {
 						this.archiveCalls++;
 						return "/Users/person/git/MyProject/platforms/ios/archive/MyProject.ipa";
 					},
-					buildForSimulator: async () => ({}),
+					buildForSimulator: () => Promise.resolve(),
 					buildForAppStore: async () => {
 						this.archiveCalls++;
 						return "/Users/person/git/MyProject/platforms/ios/archive/MyProject.ipa";