From b40adab382d068eee573eb4fa8c6cfa3c3d61357 Mon Sep 17 00:00:00 2001 From: Kaira Diagne Date: Thu, 18 Feb 2021 12:30:29 +0100 Subject: [PATCH 1/2] Fix compilation error that happened due to naming changes in OctoKit. --- Sources/GitBuddyCore/GitHub/IssuesFetcher.swift | 2 +- Sources/GitBuddyCore/GitHub/PullRequestFetcher.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/GitBuddyCore/GitHub/IssuesFetcher.swift b/Sources/GitBuddyCore/GitHub/IssuesFetcher.swift index 261eed2..f06c334 100644 --- a/Sources/GitBuddyCore/GitHub/IssuesFetcher.swift +++ b/Sources/GitBuddyCore/GitHub/IssuesFetcher.swift @@ -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) diff --git a/Sources/GitBuddyCore/GitHub/PullRequestFetcher.swift b/Sources/GitBuddyCore/GitHub/PullRequestFetcher.swift index 752541d..84139a4 100644 --- a/Sources/GitBuddyCore/GitHub/PullRequestFetcher.swift +++ b/Sources/GitBuddyCore/GitHub/PullRequestFetcher.swift @@ -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) From 16790bd9253ee968e3abb1214c94e4527a3708d3 Mon Sep 17 00:00:00 2001 From: Kaira Diagne Date: Thu, 18 Feb 2021 12:35:13 +0100 Subject: [PATCH 2/2] Include package.resolved to lock the dependencies. --- .gitignore | 1 - Package.resolved | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 Package.resolved diff --git a/.gitignore b/.gitignore index 25ecf60..9eddb2d 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..b44b05e --- /dev/null +++ b/Package.resolved @@ -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 +}