From e5f0de5dbb527239d833b221dfecb79ec64263d0 Mon Sep 17 00:00:00 2001 From: Dimitris Koutsogiorgas Date: Mon, 2 Mar 2020 11:36:10 -0800 Subject: [PATCH] Apply correct `SYSTEM_FRAMEWORK_SEARCH_PATHS` for `XCTUnwrap` fix. --- CHANGELOG.md | 4 ++++ lib/cocoapods/target/build_settings.rb | 2 +- spec/unit/target/build_settings/pod_target_settings_spec.rb | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56604be731..00d581ab5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/lib/cocoapods/target/build_settings.rb b/lib/cocoapods/target/build_settings.rb index 08c5341fab..c17244f59b 100644 --- a/lib/cocoapods/target/build_settings.rb +++ b/lib/cocoapods/target/build_settings.rb @@ -691,7 +691,7 @@ def initialize(target, non_library_spec = nil, configuration: nil) # @return [Array] 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 diff --git a/spec/unit/target/build_settings/pod_target_settings_spec.rb b/spec/unit/target/build_settings/pod_target_settings_spec.rb index c29f5260e2..c15628d6c2 100644 --- a/spec/unit/target/build_settings/pod_target_settings_spec.rb +++ b/spec/unit/target/build_settings/pod_target_settings_spec.rb @@ -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 @@ -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