Skip to content

Support library add command with iOS 7 #795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
toddwong wants to merge 1 commit into from
+4 −6
Closed

Support library add command with iOS 7 #795

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions lib/services/ios-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<void>()();
}

Expand Down Expand Up @@ -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 })
});

Expand Down Expand Up @@ -379,4 +377,4 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
}).future<void>()();
}
}
$injector.register("iOSProjectService", IOSProjectService);
$injector.register("iOSProjectService", IOSProjectService);