Skip to content

Commit d234833

Browse files
committed
fix validate_every_pod_only_have_one_form
1 parent cdc913a commit d234833

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

lib/cocoapods-binary/helper/podfile_options.rb

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ class TargetDefinition
1111

1212
## --- option for setting using prebuild framework ---
1313
def parse_prebuild_framework(name, requirements)
14+
15+
should_prebuild = Pod::Podfile::DSL.prebuild_all
16+
1417
options = requirements.last
15-
return requirements unless options.is_a?(Hash)
18+
if options.is_a?(Hash) && options[Pod::Prebuild.keyword] != nil
19+
should_prebuild = options.delete(Pod::Prebuild.keyword)
20+
requirements.pop if options.empty?
21+
end
1622

17-
should_prebuild_framework = options.delete(Pod::Prebuild.keyword)
1823
pod_name = Specification.root_name(name)
19-
set_prebuild_for_pod(pod_name, should_prebuild_framework)
20-
requirements.pop if options.empty?
24+
set_prebuild_for_pod(pod_name, should_prebuild)
2125
end
2226

2327
def set_prebuild_for_pod(pod_name, should_prebuild)
@@ -105,7 +109,9 @@ def validate_every_pod_only_have_one_form
105109
aggregate_targets.each do |aggregate_target|
106110
target_definition = aggregate_target.target_definition
107111
prebuit += target_definition.prebuild_framework_pod_names
108-
not_prebuilt += target_definition.should_not_prebuild_framework_pod_names
112+
not_prebuilt += aggregate_target.pod_targets.reject do |target|
113+
target_definition.prebuild_framework_pod_names.include? target.pod_name
114+
end.map(&:pod_name)
109115
end
110116

111117
intersection = prebuit & not_prebuilt

0 commit comments

Comments
 (0)