Merge pull request #3685 from NativeScript/vladimirov/fix-run-ios-sk

rosen-vladimirov · web-flow · commit aaa980cecb65 · 2018-06-15T17:17:03.000+03:00
fix: Unable to run app on iOS in Sidekick
diff --git a/lib/services/ios-debugger-port-service.ts b/lib/services/ios-debugger-port-service.ts
@@ -51,7 +51,7 @@ export class IOSDebuggerPortService implements IIOSDebuggerPortService {
 	private canStartLookingForDebuggerPort(data: IProjectDir): boolean {
 		const projectData = this.$projectDataService.getProjectData(data && data.projectDir);
 		const frameworkVersion = this.$iOSProjectService.getFrameworkVersion(projectData);
-		return semver.gt(frameworkVersion, IOSDebuggerPortService.MIN_REQUIRED_FRAMEWORK_VERSION);
+		return !frameworkVersion || semver.gt(frameworkVersion, IOSDebuggerPortService.MIN_REQUIRED_FRAMEWORK_VERSION);
 	}
 
 	@cache()
diff --git a/lib/services/platform-project-service-base.ts b/lib/services/platform-project-service-base.ts
@@ -13,7 +13,8 @@ export abstract class PlatformProjectServiceBase extends EventEmitter implements
 	}
 
 	public getFrameworkVersion(projectData: IProjectData): string {
-		return this.$projectDataService.getNSValue(projectData.projectDir, this.getPlatformData(projectData).frameworkPackageName).version;
+		const frameworkData = this.$projectDataService.getNSValue(projectData.projectDir, this.getPlatformData(projectData).frameworkPackageName);
+		return frameworkData && frameworkData.version;
 	}
 
 	protected getAllNativeLibrariesForPlugin(pluginData: IPluginData, platform: string, filter: (fileName: string, _pluginPlatformsFolderPath: string) => boolean): string[] {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ export class IOSDebuggerPortService implements IIOSDebuggerPortService {`
`51`	`51`	`private canStartLookingForDebuggerPort(data: IProjectDir): boolean {`
`52`	`52`	`const projectData = this.$projectDataService.getProjectData(data && data.projectDir);`
`53`	`53`	`const frameworkVersion = this.$iOSProjectService.getFrameworkVersion(projectData);`
`54`		`- return semver.gt(frameworkVersion, IOSDebuggerPortService.MIN_REQUIRED_FRAMEWORK_VERSION);`
	`54`	`+ return !frameworkVersion \|\| semver.gt(frameworkVersion, IOSDebuggerPortService.MIN_REQUIRED_FRAMEWORK_VERSION);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@cache()`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@ export abstract class PlatformProjectServiceBase extends EventEmitter implements`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public getFrameworkVersion(projectData: IProjectData): string {`
`16`		`- return this.$projectDataService.getNSValue(projectData.projectDir, this.getPlatformData(projectData).frameworkPackageName).version;`
	`16`	`+ const frameworkData = this.$projectDataService.getNSValue(projectData.projectDir, this.getPlatformData(projectData).frameworkPackageName);`
	`17`	`+ return frameworkData && frameworkData.version;`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`protected getAllNativeLibrariesForPlugin(pluginData: IPluginData, platform: string, filter: (fileName: string, _pluginPlatformsFolderPath: string) => boolean): string[] {`