-
Notifications
You must be signed in to change notification settings - Fork 464
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Do not raise an exception on a Swift Package dependency #881
Merged
dnkoutso
merged 2 commits into
CocoaPods:master
from
vincentisambart:swiftpm-dependencies
May 16, 2022
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,9 +34,10 @@ class PBXTargetDependency < AbstractObject | |
# | ||
attribute :platform_filters, Array | ||
|
||
# @return [String] the product reference for this target dependency. | ||
# @return [XCSwiftPackageProductDependency] the Swift Package product | ||
# for this target dependency. | ||
# | ||
attribute :product_ref, String | ||
has_one :product_ref, XCSwiftPackageProductDependency | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I had to change |
||
|
||
public | ||
|
||
|
@@ -49,20 +50,22 @@ def display_name | |
return name if name | ||
return target.name if target | ||
return target_proxy.remote_info if target_proxy | ||
return product_ref.product_name if product_ref | ||
end | ||
|
||
def ascii_plist_annotation | ||
" #{isa} " | ||
end | ||
|
||
# @return [String] uuid of the target, if the dependency | ||
# is a native target, otherwise the uuid of the | ||
# target in the sub-project if the dependency is | ||
# a target proxy | ||
# @return [String] the uuid of the target if the dependency is a native | ||
# target, the uuid of the target in the sub-project if the | ||
# dependency is a target proxy, nil if the dependency is a Swift | ||
# Package. | ||
# | ||
def native_target_uuid | ||
return target.uuid if target | ||
return target_proxy.remote_global_id_string if target_proxy | ||
return nil if product_ref | ||
raise "Expected target or target_proxy, from which to fetch a uuid for target '#{display_name}'." \ | ||
"Find and clear the PBXTargetDependency entry with uuid '#{@uuid}' in your .xcodeproj." | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: please add two empty spaces at the end of this line for markdown formattin.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done