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

fix: ignore non-nativetargets during ios linking #123

Merged
merged 3 commits into from
Feb 11, 2019
Merged

fix: ignore non-nativetargets during ios linking #123

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8481e4
fix: ignore non-nativetargets during ios linking
dotconnor Jan 24, 2019
05687c1
refactor: reuse variable and reorder array methods
dotconnor Feb 11, 2019
d461f07
Merge branch 'master' into master
grabbou Feb 11, 2019
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
48 changes: 26 additions & 22 deletions packages/cli/src/link/ios/getTargets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,29 @@ export default function getTargets(project) {
firstProject: { targets },
} = project.getFirstProject();
const nativeTargetSection = project.pbxNativeTargetSection();
return targets.map(target => {
const key = target.value;
const configurationListId = project.pbxNativeTargetSection()[key]
.buildConfigurationList;
const configurationList = project.pbxXCConfigurationList()[
configurationListId
];
const buildConfigurationId = configurationList.buildConfigurations[0].value;
const buildConfiguration = project.pbxXCBuildConfigurationSection()[
buildConfigurationId
];
return {
uuid: key,
target: nativeTargetSection[key],
name: nativeTargetSection[key].productReference_comment,
isTVOS:
(buildConfiguration.buildSettings.SDKROOT &&
buildConfiguration.buildSettings.SDKROOT.indexOf('appletv') !== -1) ||
false,
};
});
}
return targets
.filter(target => nativeTargetSection[target.value] !== undefined)
.map(target => {
const key = target.value;
const configurationListId =
nativeTargetSection[key].buildConfigurationList;
const configurationList = project.pbxXCConfigurationList()[
configurationListId
];
const buildConfigurationId =
configurationList.buildConfigurations[0].value;
const buildConfiguration = project.pbxXCBuildConfigurationSection()[
buildConfigurationId
];
return {
uuid: key,
target: nativeTargetSection[key],
name: nativeTargetSection[key].productReference_comment,
isTVOS:
(buildConfiguration.buildSettings.SDKROOT &&
buildConfiguration.buildSettings.SDKROOT.indexOf('appletv') !==
-1) ||
false,
};
});
};