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 static Swift XCFramework import paths #11093

Merged
merged 4 commits into from Feb 25, 2022
Merged

Fix static Swift XCFramework import paths #11093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ec3561
fix static Swift XCFramework
igor-makarov Dec 9, 2021
dd8f49a
fix test that wasn't specific enough
igor-makarov Dec 12, 2021
dc0d6a8
update integration sumbodule
igor-makarov Dec 12, 2021
273ac32
add changelog entry
igor-makarov Dec 12, 2021
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: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -20,6 +20,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Kanstantsin Shautsou](https://github.com/KostyaSha)
[#11010](https://github.com/CocoaPods/CocoaPods/issues/11010)

* Fix static Swift XCFramework import paths.
[Igor Makarov](https://github.com/igor-makarov)
[#11058](https://github.com/CocoaPods/CocoaPods/issues/10058)
[#11093](https://github.com/CocoaPods/CocoaPods/pull/11093)

## 1.11.2 (2021-09-13)

##### Enhancements
Expand Down
2 changes: 2 additions & 0 deletions lib/cocoapods/target/build_settings.rb
View file
Open in desktop
Expand Up @@ -938,6 +938,8 @@ def other_swift_flags_without_swift?
define_build_settings_method :swift_include_paths, :build_setting => true, :memoized => true, :sorted => true, :uniqued => true do
paths = dependent_targets.flat_map { |pt| pt.build_settings[@configuration].swift_include_paths_to_import }
paths.concat swift_include_paths_to_import if non_library_xcconfig?
vendored_static_library_search_paths = dependent_targets.flat_map { |pt| pt.build_settings[@configuration].vendored_static_library_search_paths }
paths.concat vendored_static_library_search_paths
paths.concat ['$(PLATFORM_DIR)/Developer/usr/lib'] if should_apply_xctunwrap_fix?
paths
end
Expand Down
2 changes: 1 addition & 1 deletion spec/cocoapods-integration-specs
Open in desktop
Submodule cocoapods-integration-specs updated 2 files
+1 −0 ...ed_static_library_xcframework/after/Pods/Target Support Files/BananaLib/BananaLib.unit-tests.debug.xcconfig
+1 −0 ..._static_library_xcframework/after/Pods/Target Support Files/BananaLib/BananaLib.unit-tests.release.xcconfig
2 changes: 1 addition & 1 deletion spec/unit/target/build_settings/pod_target_settings_spec.rb
View file
Open in desktop
Expand Up @@ -211,7 +211,7 @@ class BuildSettings
hash = generator.generate.to_hash
hash['SYSTEM_FRAMEWORK_SEARCH_PATHS'].should.be.nil
hash['LIBRARY_SEARCH_PATHS'].should.not.include '"$(PLATFORM_DIR)/Developer/usr/lib"'
hash['SWIFT_INCLUDE_PATHS'].should.be.nil
hash['SWIFT_INCLUDE_PATHS'].should.not.include '"$(PLATFORM_DIR)/Developer/usr/lib"'
end

it 'saves the xcconfig' do
Expand Down