Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 99f3c46

Browse files
Merge pull request #86 from Adyen/swift-package-improvements
Swift package improvements
2 parents b0196c4 + 0441b6d commit 99f3c46

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

‎Package.resolved‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Sources/Shared/Package/SwiftPackageFileHelperModule/SwiftPackageDescription.swift‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,10 @@ extension SwiftPackageDescription.Dependency: CustomStringConvertible {
123123
package extension SwiftPackageDescription.Dependency {
124124

125125
struct Requirement: Codable, Equatable {
126-
127-
// TODO: Which other requirements exist?
128-
129126
package let exact: [String]?
130127
package let range: [[String: String]]?
128+
package let branch: [String]?
129+
package let revision: [String]?
131130
}
132131
}
133132

@@ -141,6 +140,14 @@ extension SwiftPackageDescription.Dependency.Requirement: CustomStringConvertibl
141140
if let lowerUpper = range?.first, let lower = lowerUpper["lower_bound"], let upper = lowerUpper["upper_bound"] {
142141
return "\"\(lower)\"..<\"\(upper)\""
143142
}
143+
144+
if let branch = branch?.first {
145+
return "branch: \"\(branch)\""
146+
}
147+
148+
if let revision = revision?.first {
149+
return "revision: \"\(revision)\""
150+
}
144151

145152
return "UNKNOWN_REQUIREMENT"
146153
}

‎Sources/Shared/Package/SwiftPackageFileHelperModule/SwiftPackageFileHelper.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ private extension SwiftPackageFileHelper {
103103

104104
let result = try loadPackageDescription(projectDirectoryPath: projectDirectoryPath)
105105

106-
let newLine = "\n"
107106
let errorTag = "error: "
108107
let warningTag = "warning: "
109108

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /