Skip to content

Commit

Permalink
Merge pull request #66 from WeTransfer/feature/fix-compilation-error-…
Browse files Browse the repository at this point in the history
…related-to-new-ockotkit-version

Fix compilation error that happened due to naming changes in OctoKit.
  • Loading branch information
kairadiagne authored Feb 18, 2021
2 parents 66d7486 + 16790bd commit e245e10
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 3 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ playground.xcworkspace
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
Packages/
Package.pins
Package.resolved
*.xcodeproj
#
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
Expand Down
34 changes: 34 additions & 0 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"object": {
"pins": [
{
"package": "OctoKit",
"repositoryURL": "https://github.com/nerdishbynature/octokit.swift",
"state": {
"branch": null,
"revision": "9521cdff919053868ab13cd08a228f7bc1bde2a9",
"version": "0.11.0"
}
},
{
"package": "RequestKit",
"repositoryURL": "https://github.com/nerdishbynature/RequestKit.git",
"state": {
"branch": null,
"revision": "fd5e9e99aada7432170366c9e95967011ce13bad",
"version": "2.4.0"
}
},
{
"package": "swift-argument-parser",
"repositoryURL": "https://github.com/apple/swift-argument-parser",
"state": {
"branch": null,
"revision": "9564d61b08a5335ae0a36f789a7d71493eacadfc",
"version": "0.3.2"
}
}
]
},
"version": 1
}
2 changes: 1 addition & 1 deletion Sources/GitBuddyCore/GitHub/IssuesFetcher.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ struct IssuesFetcher {

var result: Result<[Issue], Swift.Error>!

octoKit.issues(session, owner: project.organisation, repository: project.repository, state: .Closed) { (response) in
octoKit.issues(session, owner: project.organisation, repository: project.repository, state: .closed) { (response) in
switch response {
case .success(let issues):
result = .success(issues)
Expand Down
2 changes: 1 addition & 1 deletion Sources/GitBuddyCore/GitHub/PullRequestFetcher.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct PullRequestFetcher {

var result: Result<[PullRequest], Swift.Error>!

octoKit.pullRequests(session, owner: project.organisation, repository: project.repository, base: baseBranch, state: .Closed, sort: .updated, direction: .desc) { (response) in
octoKit.pullRequests(session, owner: project.organisation, repository: project.repository, base: baseBranch, state: .closed, sort: .updated, direction: .desc) { (response) in
switch response {
case .success(let pullRequests):
result = .success(pullRequests)
Expand Down

0 comments on commit e245e10

Please sign in to comment.