Skip to content
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

Remove deprecated targetCommitAndReturnError #512

Merged
merged 1 commit into from
Aug 31, 2015

Conversation

phatblat
Copy link
Member

Conflicts with the non-deprecated targetCommitWithError: method in Swift 2 (Xcode 7b6)

error: ambiguous use of 'targetCommit()'
                    let gt_commit = try! gt_branch.targetCommit()
                                         ^
ObjectiveGit.GTBranch:38:14: note: found this candidate
  @objc func targetCommit() throws -> GTCommit
             ^
ObjectiveGit.GTBranch:86:14: note: found this candidate
  @objc func targetCommit() throws -> GTCommit

Conflicts with the non-deprecated method in Swift 2 (Xcode 7b6)

error: ambiguous use of 'targetCommit()'
                    let gt_commit = try! gt_branch.targetCommit()
                                         ^
ObjectiveGit.GTBranch:38:14: note: found this candidate
  @objc func targetCommit() throws -> GTCommit
             ^
ObjectiveGit.GTBranch:86:14: note: found this candidate
  @objc func targetCommit() throws -> GTCommit
@phatblat
Copy link
Member Author

If we want to keep targetCommitAndReturnError, another solution is to mark it as NS_SWIFT_UNAVAILABLE so that it is not visible from Swift.

@joshaber joshaber self-assigned this Aug 31, 2015
@joshaber
Copy link
Member

🔥

joshaber added a commit that referenced this pull request Aug 31, 2015
Remove deprecated targetCommitAndReturnError
@joshaber joshaber merged commit b7b2549 into libgit2:master Aug 31, 2015
@phatblat phatblat deleted the ben/targetCommitAndReturnError branch August 31, 2015 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants