Skip to content
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

Jump to bottom

feat(ios): support xcframeworks in modules/platform folders #12092

Merged
merged 2 commits into from
Sep 21, 2020
Merged

feat(ios): support xcframeworks in modules/platform folders #12092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
281ee20
feat(ios): support xcframeworks in modules/platform folders
sgtcoolguy Sep 16, 2020
aedb408
refactor(ios): let framework hook handle module xcframeworks
sgtcoolguy Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 2 additions & 58 deletions iphone/cli/commands/_build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2201,8 +2201,6 @@ iOSBuilder.prototype.validate = function validate(logger, config, cli) {
const xcFrameworkOfFramework = this.scrubbedModuleId(module.id) + '.xcframework';

module.isFramework = false;
module.isXCFrameworkOfLib = false;
module.isXCFrameworkOfFramework = false;

// Try to load native module as static library (Obj-C)
if (fs.existsSync(path.join(module.modulePath, 'lib' + module.id.toLowerCase() + '.a'))) {
Expand All @@ -2225,7 +2223,7 @@ iOSBuilder.prototype.validate = function validate(logger, config, cli) {
} else if (fs.existsSync(path.join(module.modulePath, xcFrameworkOfLib))) {
module.libName = xcFrameworkOfLib;
module.libFile = path.join(module.modulePath, module.libName);
module.isXCFrameworkOfLib = true;
module.isFramework = true;

// TODO: read Info.plist to get the full scope of targets/arches supported!
let archDir = 'ios-arm64_i386_x86_64-simulator';
Expand All @@ -2239,7 +2237,7 @@ iOSBuilder.prototype.validate = function validate(logger, config, cli) {
} else if (fs.existsSync(path.join(module.modulePath, xcFrameworkOfFramework))) {
module.libName = xcFrameworkOfFramework;
module.libFile = path.join(module.modulePath, module.libName);
module.isXCFrameworkOfFramework = true;
module.isFramework = true;

// TODO: read Info.plist to get the full scope of targets/arches supported!
let archDir = 'ios-arm64_i386_x86_64-simulator';
Expand Down Expand Up @@ -3323,60 +3321,6 @@ iOSBuilder.prototype.createXcodeProject = function createXcodeProject(next) {
// Framworks are handled by our framework manager!
if (isFramework) {
return;
} else if (lib.isXCFrameworkOfFramework || lib.isXCFrameworkOfLib) {
const frameworkFileRefUuid = this.generateXcodeUuid(xcodeProject);
const frameworkBuildFileUuid = this.generateXcodeUuid(xcodeProject);

xobjs.PBXFileReference[frameworkFileRefUuid] = {
isa: 'PBXFileReference',
lastKnownFileType: 'wrapper.xcframework',
name: lib.libName,
path: '"' + lib.libFile + '"',
sourceTree: '"<group>"'
};
xobjs.PBXFileReference[frameworkFileRefUuid + '_comment'] = lib.libName;

xobjs.PBXBuildFile[frameworkBuildFileUuid] = {
isa: 'PBXBuildFile',
fileRef: frameworkFileRefUuid,
fileRef_comment: lib.libName
};
xobjs.PBXBuildFile[frameworkBuildFileUuid + '_comment'] = lib.libName + ' in Frameworks';

frameworksBuildPhase.files.push({
value: frameworkBuildFileUuid,
comment: xobjs.PBXBuildFile[frameworkBuildFileUuid + '_comment']
});

if (lib.isXCFrameworkOfFramework) {
const embedFrameworkBuildFileUuid = this.generateXcodeUuid(xcodeProject);
// add the build file
xobjs.PBXBuildFile[buildFileUuid] = {
isa: 'PBXBuildFile',
fileRef: fileRefUuid,
fileRef_comment: lib.libName,
platformFilter: 'ios'
};
xobjs.PBXBuildFile[buildFileUuid + '_comment'] = lib.libName + ' in Frameworks';

xobjs.PBXBuildFile[embedFrameworkBuildFileUuid] = {
isa: 'PBXBuildFile',
fileRef: frameworkFileRefUuid,
fileRef_comment: lib.libName,
settings: { ATTRIBUTES: [ 'CodeSignOnCopy', 'RemoveHeadersOnCopy' ] }
};
xobjs.PBXBuildFile[embedFrameworkBuildFileUuid + '_comment'] = lib.libName + ' in Embed Frameworks';

copyFilesBuildPhase.files.push({
value: embedFrameworkBuildFileUuid,
comment: xobjs.PBXBuildFile[embedFrameworkBuildFileUuid + '_comment']
});
}

frameworksGroup.children.push({
value: frameworkFileRefUuid,
comment: lib.libName
});
} else {
// add the file reference
xobjs.PBXFileReference[fileRefUuid] = {
Expand Down