From 74f29065f85903a2181c8450adcd2d41d239194b Mon Sep 17 00:00:00 2001 From: Fatme Havaluova Date: Fri, 13 Nov 2015 11:32:35 +0200 Subject: [PATCH] Don't try to execute fast livesync if the project has framework version lower than 1.5.0 --- lib/services/usb-livesync-service.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/services/usb-livesync-service.ts b/lib/services/usb-livesync-service.ts index 88ed619ea5..321eab9f0f 100644 --- a/lib/services/usb-livesync-service.ts +++ b/lib/services/usb-livesync-service.ts @@ -49,9 +49,10 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer let platformData = this.$platformsData.getPlatformData(platformLowerCase); + this.$projectDataService.initialize(this.$projectData.projectDir); + let frameworkVersion = this.$projectDataService.getValue(platformData.frameworkPackageName).wait().version; + if (platformLowerCase === this.$devicePlatformsConstants.Android.toLowerCase()) { - this.$projectDataService.initialize(this.$projectData.projectDir); - let frameworkVersion = this.$projectDataService.getValue(platformData.frameworkPackageName).wait().version; if (semver.lt(frameworkVersion, "1.2.1")) { let shouldUpdate = this.$prompter.confirm( "You need Android Runtime 1.2.1 or later for LiveSync to work properly. Do you want to update your runtime now?" @@ -139,6 +140,8 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer return platformSpecificUsbLiveSyncService.sendPageReloadMessageToDevice(deviceAppData).wait(); }); } + + this.$logger.info(`Successfully synced application ${this.$projectData.projectId}.`); }).future()(); }); }; @@ -156,7 +159,7 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer beforeLiveSyncAction: beforeLiveSyncAction, beforeBatchLiveSyncAction: beforeBatchLiveSyncAction, iOSSimulatorRelativeToProjectBasePathAction: iOSSimulatorRelativeToProjectBasePathAction, - canExecuteFastLiveSync: (filePath: string) => _.contains(fastLivesyncFileExtensions, path.extname(filePath)), + canExecuteFastLiveSync: (filePath: string) => _.contains(fastLivesyncFileExtensions, path.extname(filePath)) && semver.gte(frameworkVersion, "1.5.0"), fastLiveSync: fastLiveSync };