Skip to content

Commit 4baf86b

Browse files
committed
Fix release script
1 parent 99ca461 commit 4baf86b

File tree

4 files changed

+22
-20
lines changed

4 files changed

+22
-20
lines changed

Package.swift

+2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,9 @@ let package = Package(
7878
"tag",
7979
"push",
8080
"Scripts/change_is_develop.sh true",
81+
"git_add",
8182
["commit": ["message": "Enable dev depdendencies"]],
83+
"push",
8284
"Scripts/create_homebrew_tap.sh",
8385
],
8486
],

Sources/DangerDependenciesResolver/PackageGenerator.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ struct PackageGenerator {
8181
func makeSupportedPlatform(forMacOSVersion macOSVersion: Version) -> String {
8282
if case .null = macOSVersion { return "" }
8383
switch macOSVersion.major {
84-
case 10 where (10...15).contains(macOSVersion.minor):
84+
case 10 where (10 ... 15).contains(macOSVersion.minor):
8585
return ".macOS(.v10_\(macOSVersion.minor))"
8686
case 11...:
8787
return ".macOS(.v\(macOSVersion.major))"

Sources/DangerDependenciesResolver/PackageManager.swift

+13-13
Original file line numberDiff line numberDiff line change
@@ -186,20 +186,20 @@ public struct PackageManager {
186186

187187
private func resolveMacOSVersion(executor: ShellExecutor) -> Version {
188188
#if os(macOS)
189-
var versionString = executor.execute("sw_vers",
190-
arguments: ["-productVersion"])
191-
versionString = versionString.onlyNumbersAndDots ?? versionString
192-
switch versionString.components(separatedBy: ".").count {
193-
case 1:
194-
versionString += ".0.0"
195-
case 2:
196-
versionString += ".0"
197-
default:
198-
break
199-
}
200-
return Version(versionString) ?? .null
189+
var versionString = executor.execute("sw_vers",
190+
arguments: ["-productVersion"])
191+
versionString = versionString.onlyNumbersAndDots ?? versionString
192+
switch versionString.components(separatedBy: ".").count {
193+
case 1:
194+
versionString += ".0.0"
195+
case 2:
196+
versionString += ".0"
197+
default:
198+
break
199+
}
200+
return Version(versionString) ?? .null
201201
#else
202-
return .null
202+
return .null
203203
#endif
204204
}
205205
}

Tests/DangerTests/GitDiffTests.swift

+6-6
Original file line numberDiff line numberDiff line change
@@ -216,14 +216,14 @@ final class GitDiffTests: XCTestCase {
216216
+ } }
217217
}
218218
}
219-
219+
220220
diff --git a/Sources/DangerSwiftCoverage/SPM/SPMCoverageParser.swift b/Sources/DangerSwiftCoverage/SPM/SPMCoverageParser.swift
221221
index 7b22444..1e7d9ff 100644
222222
--- a/Sources/DangerSwiftCoverage/SPM/SPMCoverageParser.swift
223223
+++ b/Sources/DangerSwiftCoverage/SPM/SPMCoverageParser.swift
224224
@@ -1,8 +1,11 @@
225225
import Foundation
226-
226+
227227
+
228228
+
229229
+
@@ -232,13 +232,13 @@ final class GitDiffTests: XCTestCase {
232232
- static func coverage(spmCoverageFolder: String, files: [String]) throws -> Report
233233
-}
234234
+ static func coverage(spmCoverageFolder: String, files: [String]) throws -> Re
235-
235+
236236
enum SPMCoverageParser: SPMCoverageParsing {
237237
enum Errors: Error {
238238
@@ -22,6 +25,10 @@ enum SPMCoverageParser: SPMCoverageParsing {
239239
let coverage = try JSONDecoder().decode(SPMCoverage.self, from: data)
240240
let filteredCoverage = coverage.filteringFiles(notOn: files)
241-
241+
242242
- return Report(messages: [], sections: [ReportSection(fromSPM: filteredCoverage, fileManager: fileManager)])
243243
+ if filteredCoverage.data.contains(where: { !$0.files.isEmpty }) {
244244
+ return Report(messages: [], sections: [ReportSection(fromSPM: filteredCoverage, fileManager: fileManager)])
@@ -255,13 +255,13 @@ final class GitDiffTests: XCTestCase {
255255
--- a/Sources/DangerSwiftCoverage/ShellOutExecutor.swift
256256
+++ b/Sources/DangerSwiftCoverage/ShellOutExecutor1.swift
257257
@@ -3,6 +3,8 @@ import Foundation
258-
258+
259259
protocol ShellOutExecuting {
260260
func execute(command: String) throws -> Data
261261
+
262262
+
263263
}
264-
264+
265265
struct ShellOutExecutor: ShellOutExecuting {
266266
"""
267267
}

0 commit comments

Comments
 (0)