Commit 3207c69f authored by Jacek Suliga's avatar Jacek Suliga

Fix the case for app extensions

parent 22071111
...@@ -218,6 +218,7 @@ module Pod ...@@ -218,6 +218,7 @@ module Pod
frameworks_group = project.frameworks_group frameworks_group = project.frameworks_group
test_only_pod_targets = pod_targets.dup test_only_pod_targets = pod_targets.dup
pod_targets_for_deps = Set.new pod_targets_for_deps = Set.new
pod_extension_targets = Set.new
aggregate_targets.each do |aggregate_target| aggregate_targets.each do |aggregate_target|
is_app_extension = !(aggregate_target.user_targets.map(&:symbol_type) & is_app_extension = !(aggregate_target.user_targets.map(&:symbol_type) &
[:app_extension, :watch_extension, :watch2_extension, :tv_extension, :messages_extension]).empty? [:app_extension, :watch_extension, :watch2_extension, :tv_extension, :messages_extension]).empty?
...@@ -240,13 +241,18 @@ module Pod ...@@ -240,13 +241,18 @@ module Pod
aggregate_target.native_target.add_dependency(pod_target.native_target) aggregate_target.native_target.add_dependency(pod_target.native_target)
configure_app_extension_api_only_for_target(pod_target) if is_app_extension configure_app_extension_api_only_for_target(pod_target) if is_app_extension
if is_app_extension
pod_extension_targets << pod_target
end
pod_targets_for_deps << pod_target pod_targets_for_deps << pod_target
unless pod_target.static_framework? unless pod_target.static_framework?
add_pod_target_test_dependencies(pod_target, frameworks_group) add_pod_target_test_dependencies(pod_target, frameworks_group)
end end
end end
end end
test_pod_targets_for_deps = Set.new
# Wire up remaining pod targets used only by tests and are not used by any aggregate target. # Wire up remaining pod targets used only by tests and are not used by any aggregate target.
test_only_pod_targets.each do |pod_target| test_only_pod_targets.each do |pod_target|
unless pod_target.should_build? unless pod_target.should_build?
...@@ -254,23 +260,19 @@ module Pod ...@@ -254,23 +260,19 @@ module Pod
next next
end end
unless pod_target.static_framework? unless pod_target.static_framework?
test_pod_targets_for_deps << pod_target pod_targets_for_deps << pod_target
add_pod_target_test_dependencies(pod_target, frameworks_group) add_pod_target_test_dependencies(pod_target, frameworks_group)
end end
end end
# Actually add the dependent targets # Actually add the dependent targets
pod_targets_for_deps.each do |pod_target| pod_targets_for_deps.each do |pod_target|
is_app_extension = pod_extension_targets.include? pod_target
add_dependent_targets_to_native_target(pod_target.dependent_targets, add_dependent_targets_to_native_target(pod_target.dependent_targets,
pod_target.native_target, is_app_extension, pod_target.native_target,
pod_target.requires_frameworks? && !pod_target.static_framework?, is_app_extension,
frameworks_group) pod_target.requires_frameworks? && !pod_target.static_framework?,
end frameworks_group)
test_pod_targets_for_deps.each do |test_pod_target|
add_dependent_targets_to_native_target(test_pod_target.dependent_targets,
test_pod_target.native_target, false,
test_pod_target.requires_frameworks?, frameworks_group)
end end
end end
......
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