Commit bc9f8f99 authored by Samuel Giddins's avatar Samuel Giddins

Stop linking frameworks to static libraries to avoid warnings with the new build system

parent a0472395
......@@ -40,6 +40,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
* Improve performance of grouping pods by configuration.
[Samuel Giddins](https://github.com/segiddins)
* Stop linking frameworks to static libraries to avoid warnings with the new build system.
[Samuel Giddins](https://github.com/segiddins)
[#7570](https://github.com/CocoaPods/CocoaPods/pull/7570)
## 1.5.2 (2018-05-09)
......
......@@ -31,7 +31,7 @@ GIT
GIT
remote: https://github.com/CocoaPods/Xcodeproj.git
revision: b27620b3dd31ce2f9201fbb9c05f195cda74434a
revision: 3333a879ecd24c42ebb6fc99ce4897ee099d4ce3
branch: master
specs:
xcodeproj (1.5.8)
......
......@@ -220,6 +220,7 @@ module Pod
sorted_installation_results.each do |target_installation_result|
pod_target = target_installation_result.target
next unless pod_target.should_build?
next if !pod_target.requires_frameworks? || pod_target.static_framework?
pod_target.file_accessors.each do |file_accessor|
native_target = target_installation_result.native_target_for_spec(file_accessor.spec)
add_system_frameworks_to_native_target(native_target, file_accessor)
......
......@@ -191,7 +191,7 @@ module Pod
# @return [Boolean] Whether the target should build a static framework.
#
def static_framework?
root_spec.static_framework
requires_frameworks? && root_spec.static_framework
end
# @return [Boolean] Whether the target defines a "module"
......
Subproject commit c9eb7708b0c8d528ddbe030e93fc6ef80bab9691
Subproject commit dd63f1db0cda5489fbcc0b0c0ebe1f4b7ddbb0e7
......@@ -176,12 +176,18 @@ module Pod
]
end
it 'adds system frameworks to targets' do
it 'adds no system frameworks to static targets' do
@generator.generate!
@generator.project.targets.find { |t| t.name == 'OrangeFramework' }.frameworks_build_phase.file_display_names.sort.should == [
'Foundation.framework',
'UIKit.framework',
]
@generator.project.targets.find { |t| t.name == 'OrangeFramework' }.frameworks_build_phase.file_display_names.should == []
end
it 'adds system frameworks to dynamic targets' do
@orangeframework_pod_target.stubs(:requires_frameworks? => true)
@generator.generate!
@generator.project.targets.find { |t| t.name == 'OrangeFramework' }.frameworks_build_phase.file_display_names.should == %w(
Foundation.framework
UIKit.framework
)
end
it 'adds target dependencies when inheriting search paths' do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment