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

fix(ios): ignore duplicate and unnecessary framework search paths #12146

Merged
merged 2 commits into from
Oct 1, 2020
Merged

fix(ios): ignore duplicate and unnecessary framework search paths #12146

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
4b61d9d
fix(ios): ignore duplicate and unnecessary framework search paths
janvennemann Oct 1, 2020
7e3b0d0
Merge branch 'master' into TIMOB-28158
Oct 1, 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
5 changes: 3 additions & 2 deletions iphone/cli/commands/_build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ const appc = require('node-appc'),
parallel = appc.async.parallel,
series = appc.async.series,
plist = require('simple-plist'),
version = appc.version;
version = appc.version,
merge = require('lodash.merge');
const platformsRegExp = new RegExp('^(' + ti.allPlatformNames.join('|') + ')$'); // eslint-disable-line security/detect-non-literal-regexp
const pemCertRegExp = /(^-----BEGIN CERTIFICATE-----)|(-----END CERTIFICATE-----.*$)|\n/g;

Expand Down Expand Up @@ -3255,7 +3256,7 @@ iOSBuilder.prototype.createXcodeProject = function createXcodeProject(next) {

// set the target-specific build settings
xobjs.XCConfigurationList[xobjs.PBXNativeTarget[mainTargetUuid].buildConfigurationList].buildConfigurations.forEach(function (buildConf) {
const bs = appc.util.mix(xobjs.XCBuildConfiguration[buildConf.value].buildSettings, buildSettings);
const bs = merge(xobjs.XCBuildConfiguration[buildConf.value].buildSettings, buildSettings);
delete bs['"CODE_SIGN_IDENTITY[sdk=iphoneos*]"'];

bs.PRODUCT_BUNDLE_IDENTIFIER = '"' + this.tiapp.id + '"';
Expand Down
7 changes: 6 additions & 1 deletion iphone/cli/hooks/frameworks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,12 @@ class FrameworkIntegrator {
if (frameworkInfo.type === FRAMEWORK_TYPE_DYNAMIC) {
this.addEmbedFrameworkBuildPhase(frameworkInfo, fileRefUuid);
}
this.addFrameworkSearchPath(frameworkInfo.searchPath);
// Xcode has a special build phase step that handles XCFrameworks and
// extracts the correct .framework for an architecture. This works without
// consulting FRAMEWORK_SEARCH_PATHS so we don't need to modify it.
if (!frameworkInfo.isBinaryFramework) {
this.addFrameworkSearchPath(frameworkInfo.searchPath);
}
}

/**
Expand Down
5 changes: 5 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
"fs-extra": "^9.0.1",
"ioslib": "^1.7.21",
"liveview": "^1.5.4",
"lodash.merge": "^4.6.2",
"markdown": "0.5.0",
"moment": "^2.29.0",
"node-appc": "^1.1.1",
Expand Down