Skip to content

Commit 1b28940

Browse files
committed
Fixed minor issues
1 parent 93c395f commit 1b28940

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

Sources/SourcePackagesParser/LicenseType.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ enum LicenseType: String {
1818
case zlib = "zLib License"
1919

2020
init(licenseText: String) {
21-
let text = licenseText.replace(pattern: #"( +|\n)"#, expect: " ")
21+
let text = licenseText.replace(of: #"( +|\n)"#, with: " ")
2222

2323
if text.contains("Apache License") || text.contains(APACHE_2_TEXT) {
2424
self = .apache_2

Sources/SourcePackagesParser/SourcePackagesParser.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ final class SourcePackagesParser {
2121
let workspaceStateURL = URL(fileURLWithPath: sourcePackagesPath)
2222
.appendingPathComponent("workspace-state.json")
2323
guard let data = try? Data(contentsOf: workspaceStateURL),
24-
let workspaceState = try? JSONDecoder().decode(WorkspaceState.self, from: data)
25-
else {
24+
let workspaceState = try? JSONDecoder().decode(WorkspaceState.self, from: data) else {
2625
throw SPPError.couldNotReadFile(workspaceStateURL.lastPathComponent)
2726
}
2827

@@ -40,7 +39,6 @@ final class SourcePackagesParser {
4039
return Library(name: dependency.packageRef.name,
4140
licenseType: license.0,
4241
licenseBody: license.1)
43-
4442
}
4543
.sorted { $0.name.lowercased() < $1.name.lowercased() }
4644

Sources/SourcePackagesParser/String+Extension.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import Foundation
99

1010
extension String {
11-
func replace(pattern: String, expect: String) -> String {
12-
return self.replacingOccurrences(of: pattern,
13-
with: expect,
11+
func replace(of regexPattern: String, with replacement: String) -> String {
12+
return self.replacingOccurrences(of: regexPattern,
13+
with: replacement,
1414
options: .regularExpression,
1515
range: self.range(of: self))
1616
}

Sources/SourcePackagesParser/main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Foundation
99

1010
func exitWithUsage() -> Never {
1111
print("USAGE: swift run spp [base directory path] [SourcePackages directory path]")
12-
return exit(1)
12+
exit(1)
1313
}
1414

1515
func exitWithSPPError(_ sppError: SPPError) -> Never {

0 commit comments

Comments
 (0)