From d6adcf9cd755afb2dd50097eeab5abbb0fdfb93d Mon Sep 17 00:00:00 2001 From: Wang Jiangtao Date: Sun, 16 Aug 2015 01:53:34 +0800 Subject: [PATCH] Support library add command with iOS 7 --- lib/services/ios-project-service.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts index fe65893879..c9398c72be 100644 --- a/lib/services/ios-project-service.ts +++ b/lib/services/ios-project-service.ts @@ -194,11 +194,9 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase shell.cp("-R", libraryPath, fullTargetPath); let project = this.createPbxProj(); - let frameworkPath = this.getFrameworkRelativePath(libraryPath); - project.addFramework(frameworkPath, { customFramework: true, embed: true }); - project.updateBuildProperty("IPHONEOS_DEPLOYMENT_TARGET", "8.0"); + let frameworkPath = "$(PROJECT_DIR)/" + this.getFrameworkRelativePath(libraryPath); + project.addFramework(frameworkPath, { customFramework: true, embed: true, weak: true }); this.savePbxProj(project).wait(); - this.$logger.info("The iOS Deployment Target is now 8.0 in order to support Cocoa Touch Frameworks."); }).future()(); } @@ -313,7 +311,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase _.each(this.getAllDynamicFrameworksForPlugin(pluginData).wait(), fileName => { let fullFrameworkPath = path.join(pluginPlatformsFolderPath, fileName); - let relativeFrameworkPath = this.getFrameworkRelativePath(fullFrameworkPath); + let relativeFrameworkPath = "$(PROJECT_DIR)/" + this.getFrameworkRelativePath(fullFrameworkPath); project.removeFramework(relativeFrameworkPath, { customFramework: true, embed: true }) }); @@ -379,4 +377,4 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase }).future()(); } } -$injector.register("iOSProjectService", IOSProjectService); \ No newline at end of file +$injector.register("iOSProjectService", IOSProjectService);