Skip to content

C
cocoapods
Commit 146221b1 authored by Samuel Giddins's avatar Samuel Giddins
Browse files
Options

Add TODOs for removing the ability to quote-import pods from apps in 2.0

parent 29f91f35
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @ 146221b1
...@@ -143,12 +143,14 @@ module Pod ...@@ -143,12 +143,14 @@ module Pod
"#{target.build_product_path}/Headers" "#{target.build_product_path}/Headers"
end end
build_settings = { build_settings = {
# TODO: remove quote imports in CocoaPods 2.0
# Make framework headers discoverable by `import "…"` # Make framework headers discoverable by `import "…"`
'OTHER_CFLAGS' => XCConfigHelper.quote(framework_header_search_paths, '-iquote'), 'OTHER_CFLAGS' => XCConfigHelper.quote(framework_header_search_paths, '-iquote'),
} }
if pod_targets.any? { |t| !t.should_build? } if pod_targets.any? { |t| !t.should_build? }
# Make library headers discoverable by `#import "…"` # Make library headers discoverable by `#import "…"`
library_header_search_paths = target.sandbox.public_headers.search_paths(target.platform) library_header_search_paths = target.sandbox.public_headers.search_paths(target.platform)
# TODO: remove quote imports in CocoaPods 2.0
build_settings['HEADER_SEARCH_PATHS'] = XCConfigHelper.quote(library_header_search_paths) build_settings['HEADER_SEARCH_PATHS'] = XCConfigHelper.quote(library_header_search_paths)
build_settings['OTHER_CFLAGS'] += ' ' + XCConfigHelper.quote(library_header_search_paths, '-isystem') build_settings['OTHER_CFLAGS'] += ' ' + XCConfigHelper.quote(library_header_search_paths, '-isystem')
end end
...@@ -157,6 +159,7 @@ module Pod ...@@ -157,6 +159,7 @@ module Pod
# Make headers discoverable from $PODS_ROOT/Headers directory # Make headers discoverable from $PODS_ROOT/Headers directory
header_search_paths = target.sandbox.public_headers.search_paths(target.platform) header_search_paths = target.sandbox.public_headers.search_paths(target.platform)
{ {
# TODO: remove quote imports in CocoaPods 2.0
# by `#import "…"` # by `#import "…"`
'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(header_search_paths), 'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(header_search_paths),
# by `#import <…>` # by `#import <…>`
......
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