Merge pull request #1032 from NativeScript/fatme/fix-framework-version

Fix frameworkVersion

Author: dtopuzov

lib/definitions/platform.d.ts

@@ -32,7 +32,6 @@ interface IPlatformData {
 	frameworkFilesExtensions: string[];
 	frameworkDirectoriesExtensions?: string[];
 	frameworkDirectoriesNames?: string[];
-	frameworkVersion: string;
 	targetedOS?: string[];
 	configurationFileName?: string;
 	configurationFilePath?: string;

lib/services/android-project-service.ts

@@ -26,10 +26,10 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 		private $logger: ILogger,
 		private $options: IOptions,
 		$projectData: IProjectData,
-		private $projectDataService: IProjectDataService,
+		$projectDataService: IProjectDataService,
 		private $sysInfo: ISysInfo,
 		private $mobileHelper: Mobile.IMobileHelper) {
-			super($fs, $projectData);
+			super($fs, $projectData, $projectDataService);
 			this._androidProjectPropertiesManagers = Object.create(null);
 	}
 
@@ -51,7 +51,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 					`${this.$projectData.projectName}-release.apk`
 				],
 				frameworkFilesExtensions: [".jar", ".dat", ".so"],
-				frameworkVersion: this.getFrameworkVersion("tns-android"),
 				configurationFileName: "AndroidManifest.xml",
 				configurationFilePath: path.join(projectRoot, "src", "main", "AndroidManifest.xml"),
 				mergeXmlConfig: [{ "nodename": "manifest", "attrname": "*" }, {"nodename": "application", "attrname": "*"}]

lib/services/ios-project-service.ts

@@ -31,9 +31,9 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		private $iOSEmulatorServices: Mobile.IEmulatorPlatformServices,
 		private $options: IOptions,
 		private $injector: IInjector,
-		private $projectDataService: IProjectDataService,
+		$projectDataService: IProjectDataService,
 		private $prompter: IPrompter) {
-			super($fs, $projectData);
+			super($fs, $projectData, $projectDataService);
 		}
 
 	public get platformData(): IPlatformData {
@@ -57,7 +57,6 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			frameworkFilesExtensions: [".a", ".framework", ".bin"],
 			frameworkDirectoriesExtensions: [".framework"],
 			frameworkDirectoriesNames: ["Metadata", "metadataGenerator", "NativeScript", "internal"],
-			frameworkVersion: this.getFrameworkVersion("tns-ios"),
 			targetedOS: ['darwin'],
 			configurationFileName: "Info.plist",
 			configurationFilePath: path.join(projectRoot, this.$projectData.projectName,  this.$projectData.projectName+"-Info.plist"),
@@ -67,8 +66,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 
 	public getAppResourcesDestinationDirectoryPath(): IFuture<string> {
 		return (() => {
-			this.$projectDataService.initialize(this.$projectData.projectDir);
-			let frameworkVersion = this.$projectDataService.getValue(this.platformData.frameworkPackageName).wait()["version"];
+			let frameworkVersion = this.getFrameworkVersion(this.platformData.frameworkPackageName).wait();
 
 			if(semver.lt(frameworkVersion, "1.3.0")) {
 				return path.join(this.platformData.projectRoot, this.$projectData.projectName, "Resources", "icons");
@@ -159,7 +157,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			}
 
 			// Starting from tns-ios 1.4 the xcconfig file is referenced in the project template
-			if (semver.lt(this.platformData.frameworkVersion, "1.4.0")) {
+			let frameworkVersion = this.getFrameworkVersion(this.platformData.frameworkPackageName).wait();
+			if (semver.lt(frameworkVersion, "1.4.0")) {
 				basicArgs.push("-xcconfig", path.join(projectRoot, this.$projectData.projectName, "build.xcconfig"));
 			}
 

lib/services/platform-project-service-base.ts

@@ -3,7 +3,8 @@
 
 export class PlatformProjectServiceBase implements IPlatformProjectServiceBase {
 	constructor(protected $fs: IFileSystem,
-		    protected $projectData: IProjectData) {
+		    protected $projectData: IProjectData,
+			protected $projectDataService: IProjectDataService) {
 	}
 
 	public getPluginPlatformsFolderPath(pluginData: IPluginData, platform: string) {
@@ -25,12 +26,11 @@ export class PlatformProjectServiceBase implements IPlatformProjectServiceBase {
 		}).future<string[]>()();
 	}
 
-	protected getFrameworkVersion(runtimePackageName: string): string {
-		let frameworkVersion: string;
-		let jsonData = this.$fs.readJson(this.$projectData.projectFilePath).wait();
-		if (jsonData && jsonData.nativescript && jsonData.nativescript[runtimePackageName]) {
-			frameworkVersion = jsonData.nativescript[runtimePackageName].version;
-		}
-		return frameworkVersion;
+	protected getFrameworkVersion(runtimePackageName: string): IFuture<string> {
+		return (() => {
+			this.$projectDataService.initialize(this.$projectData.projectDir);
+			let frameworkVersion = this.$projectDataService.getValue(runtimePackageName).wait().version;
+			return frameworkVersion;
+		}).future<string>()();
 	}
 }