fix(ios): fix watchOS targets that include frameworks #11708
Conversation
| if (!currentFileRef.path.includes('extensions/') && currentFileRef.sourceTree === '"<group>"') { | ||
| xobjs.PBXFileReference[extFrameworkReference].path = `${ext.relPath}/${currentFileRef.path}`; | ||
| xobjs.PBXFileReference[extFrameworkReference].name = currentFileRef.path; | ||
| } |
There was a problem hiding this comment.
Before, the build failed because the frameworks embedded into the targets would only have the relative path to the build directory, e.g. MyTarget/MyFramework.framework instead of the relative Titanium project path.
| @@ -3430,7 +3436,7 @@ iOSBuilder.prototype.createXcodeProject = function createXcodeProject(next) { | |||
| }); | |||
| } | |||
|
|
|||
| const handledBuildPhases = [ 'PBXSourcesBuildPhase', 'PBXFrameworksBuildPhase', 'PBXResourcesBuildPhase', 'PBXCopyFilesBuildPhase' ]; | |||
| const handledBuildPhases = [ 'PBXSourcesBuildPhase', 'PBXFrameworksBuildPhase', 'PBXResourcesBuildPhase', 'PBXCopyFilesBuildPhase', 'PBXShellScriptBuildPhase' ]; | |||
There was a problem hiding this comment.
The PBXShellScriptBuildPhase wasn't handled so far, causing optional framework scripts to be skipped.
| @@ -3643,8 +3654,6 @@ iOSBuilder.prototype.createXcodeProject = function createXcodeProject(next) { | |||
|
|
|||
| if (legacySwift) { | |||
| extBuildSettings.EMBEDDED_CONTENT_CONTAINS_SWIFT = 'YES'; | |||
| } else { | |||
| extBuildSettings.ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = 'YES'; | |||
| } | |||
There was a problem hiding this comment.
This was an old left over from the Swift 2 times. Nowadays, swift support us enabled by default and the build manages the ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES flag on a module level.
|
|
FR Passed |
JIRA: https://jira.appcelerator.org/browse/TIMOB-27757
We are using this fix locally for around 4 months now but never had the chance to push the change. I added some inline comments to describe parts of these changes.