Skip to content

Commit

Permalink
Fixes and integration test update
Browse files Browse the repository at this point in the history
  • Loading branch information
paulb777 committed Jul 2, 2021
1 parent de0360b commit bdbd956
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
17 changes: 14 additions & 3 deletions lib/cocoapods/sandbox/file_accessor.rb
Expand Up @@ -167,16 +167,27 @@ def vendored_frameworks
# that come shipped with the Pod.
#
def vendored_dynamic_frameworks
vendored_frameworks.select do |framework|
(vendored_frameworks - vendored_xcframeworks).select do |framework|
Xcode::LinkageAnalyzer.dynamic_binary?(framework + framework.basename('.*'))
end
end

# @return [Array<Pathname>] The paths of the dynamic xcframework bundles
# that come shipped with the Pod.
#
def vendored_static_xcframeworks
vendored_xcframeworks.select do |path|
if Xcode::XCFramework.new(path).build_type == BuildType.static_framework
path
end
end
end

# @return [Array<Pathname>] The paths of the static (fake) framework
# bundles that come shipped with the Pod.
#
def vendored_static_frameworks
vendored_frameworks - vendored_dynamic_frameworks
vendored_frameworks - vendored_dynamic_frameworks - vendored_xcframeworks
end

# @return [Array<Pathname>] The paths of vendored .xcframework bundles
Expand Down Expand Up @@ -289,7 +300,7 @@ def vendored_dynamic_artifacts
# that come shipped with the Pod.
#
def vendored_static_artifacts
vendored_static_libraries + vendored_static_frameworks
vendored_static_libraries + vendored_static_frameworks + vendored_static_xcframeworks
end

# @return [Hash{String => Array<Pathname>}] A hash that describes the
Expand Down

0 comments on commit bdbd956

Please sign in to comment.