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

Apply correct SYSTEM_FRAMEWORK_SEARCH_PATHS for XCTUnwrap fix. #9579

Merged
merged 1 commit into from Mar 2, 2020
Merged

Apply correct SYSTEM_FRAMEWORK_SEARCH_PATHS for XCTUnwrap fix. #9579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -12,6 +12,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`

##### Bug Fixes

* Apply correct `SYSTEM_FRAMEWORK_SEARCH_PATHS` for `XCTUnwrap` fix.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#9579](https://github.com/CocoaPods/CocoaPods/pull/9579)

* Fix an issue that caused a build failure with vendored XCFrameworks on macOS
[Eric Amorde](https://github.com/amorde)
[#9572](https://github.com/CocoaPods/CocoaPods/issues/9572)
Expand Down
2 changes: 1 addition & 1 deletion lib/cocoapods/target/build_settings.rb
View file
Open in desktop
Expand Up @@ -691,7 +691,7 @@ def initialize(target, non_library_spec = nil, configuration: nil)

# @return [Array<String>]
define_build_settings_method :system_framework_search_paths, :build_setting => true, :memoized => true, :sorted => true, :uniqued => true do
return ['$(PLATFORM_DIR)/Developer/usr/lib'] if should_apply_xctunwrap_fix?
return ['$(PLATFORM_DIR)/Developer/Library/Frameworks'] if should_apply_xctunwrap_fix?
[]
end

Expand Down
2 changes: 1 addition & 1 deletion spec/cocoapods-integration-specs
Open in desktop
Submodule cocoapods-integration-specs updated 2 files
+1 −1 install_search_paths_inheritance/after/Pods/Target Support Files/testkit/testkit.debug.xcconfig
+1 −1 install_search_paths_inheritance/after/Pods/Target Support Files/testkit/testkit.release.xcconfig
4 changes: 2 additions & 2 deletions spec/unit/target/build_settings/pod_target_settings_spec.rb
View file
Open in desktop
Expand Up @@ -189,7 +189,7 @@ class BuildSettings
@pod_target.stubs(:platform).returns(Platform.new(:ios, '12.1'))
generator = PodTargetSettings.new(@pod_target, nil, :configuration => :debug)
hash = generator.generate.to_hash
hash['SYSTEM_FRAMEWORK_SEARCH_PATHS'].should.include '"$(PLATFORM_DIR)/Developer/usr/lib"'
hash['SYSTEM_FRAMEWORK_SEARCH_PATHS'].should.include '"$(PLATFORM_DIR)/Developer/Library/Frameworks"'
hash['LIBRARY_SEARCH_PATHS'].should.include '"$(PLATFORM_DIR)/Developer/usr/lib"'
hash['SWIFT_INCLUDE_PATHS'].should.include '"$(PLATFORM_DIR)/Developer/usr/lib"'
end
Expand All @@ -199,7 +199,7 @@ class BuildSettings
@pod_target.stubs(:platform).returns(Platform.new(:ios, '12.1'))
generator = PodTargetSettings.new(@pod_target, nil, :configuration => :debug)
hash = generator.generate.to_hash
hash['SYSTEM_FRAMEWORK_SEARCH_PATHS'].should.include '"$(PLATFORM_DIR)/Developer/usr/lib"'
hash['SYSTEM_FRAMEWORK_SEARCH_PATHS'].should.include '"$(PLATFORM_DIR)/Developer/Library/Frameworks"'
hash['LIBRARY_SEARCH_PATHS'].should.include '"$(PLATFORM_DIR)/Developer/usr/lib"'
hash['SWIFT_INCLUDE_PATHS'].should.include '"$(PLATFORM_DIR)/Developer/usr/lib"'
end
Expand Down