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): exclude all frameworks from optimizing files step #10905

Merged
merged 5 commits into from
Jul 9, 2019
Merged

fix(ios): exclude all frameworks from optimizing files step #10905

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b5fce9
fix: exclude all frameworks from optimizing files step
janvennemann May 22, 2019
e736e2e
use proper regex
janvennemann May 23, 2019
62a3980
Merge branch 'master' into TIMOB-27097
sgtcoolguy May 30, 2019
d6b70fe
Merge branch 'master' into TIMOB-27097
cb1kenobi Jun 24, 2019
ecffbdf
Merge branch 'master' into TIMOB-27097
Jul 9, 2019
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
2 changes: 1 addition & 1 deletion iphone/cli/commands/_build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6495,7 +6495,7 @@ iOSBuilder.prototype.optimizeFiles = function optimizeFiles(next) {
}
}
});
}(this.xcodeAppDir, /^(PlugIns|Watch|TitaniumKit\.framework)$/i));
}(this.xcodeAppDir, /^(PlugIns|Watch|\.framework)$/i));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean /^(PlugIns|Watch|.+\.framework)$/i?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yeah sure, didn't notice the ^ at the beginning of the regex.


parallel(this, [
function (next) {
Expand Down
2 changes: 1 addition & 1 deletion iphone/cli/hooks/frameworks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ class FrameworkIntegrator {
isa: 'PBXBuildFile',
fileRef: fileRefUuid,
fileRef_comment: frameworkPackageName,
settings: { ATTRIBUTES: [ 'CodeSignOnCopy' ] }
settings: { ATTRIBUTES: [ 'CodeSignOnCopy', 'RemoveHeadersOnCopy' ] }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe Xcode would automatically add RemoveHeadersOnCopy when you opened the generated Xcode project. I tested explicitly adding it as you've done, but as I recall it wasn't necessary, so I ripped it out. I'm fine with you adding it.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just tested this pull - it works fine without this setting.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just added it for consistency because that's the attributes we use when adding TitaniumKit as well.

};
this._xobjs.PBXBuildFile[embeddedBuildFileUuid + '_comment'] = frameworkPackageName + ' in Embed Frameworks';

Expand Down