More fixed lint changes that would not work on older swift version

danger · Oct 14, 2024 · 2804c50 · 2804c50
1 parent 82cdc5a
commit 2804c50
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/Sources/Danger/DangerUtils.swift b/Sources/Danger/DangerUtils.swift
@@ -166,9 +166,9 @@ public extension DangerUtils.Environment {
         public var description: String {
             switch self {
             case let .string(string):
-                string
+                return string
             case let .boolean(bool):
-                bool.description
+                return bool.description
             }
         }
     }

diff --git a/Sources/Danger/Extensions/DateFormatterExtensions.swift b/Sources/Danger/Extensions/DateFormatterExtensions.swift
@@ -28,7 +28,7 @@ public extension DateFormatter {
     }
 }
 
-private final class OptionalFractionalSecondsDateFormatter: DateFormatter {
+private final class OptionalFractionalSecondsDateFormatter: DateFormatter, @unchecked Sendable {
     static let withMilliseconds: DateFormatter = {
         let formatter = DateFormatter()
         setUpFormatter(formatter)
@@ -81,7 +81,7 @@ extension OptionalFractionalSecondsDateFormatter {
         var errorDescription: String? {
             switch self {
             case let .invalidFormat(path, dateString):
-                "Format Invalid with path \"\(path)\", date string: \"\(dateString)\""
+                return "Format Invalid with path \"\(path)\", date string: \"\(dateString)\""
             }
         }
     }

diff --git a/Sources/Danger/GitDiff.swift b/Sources/Danger/GitDiff.swift
@@ -16,13 +16,13 @@ public struct FileDiff: Equatable, CustomStringConvertible {
     public var changes: Changes {
         switch parsedHeader.change {
         case .created:
-            .created(addedLines: hunks.flatMap { hunk in hunk.lines.map(\.text) })
+            return .created(addedLines: hunks.flatMap { hunk in hunk.lines.map(\.text) })
         case .deleted:
-            .deleted(deletedLines: hunks.flatMap { hunk in hunk.lines.map(\.text) })
+            return .deleted(deletedLines: hunks.flatMap { hunk in hunk.lines.map(\.text) })
         case .modified:
-            .modified(hunks: hunks)
+            return .modified(hunks: hunks)
         case let .renamed(oldPath: oldPath):
-            .renamed(oldPath: oldPath, hunks: hunks)
+            return .renamed(oldPath: oldPath, hunks: hunks)
         }
     }
 
@@ -73,11 +73,11 @@ public extension FileDiff {
         public var description: String {
             switch changeType {
             case .added:
-                "+" + text
+                return "+" + text
             case .removed:
-                "-" + text
+                return "-" + text
             case .unchanged:
-                " " + text
+                return " " + text
             }
         }
     }

diff --git a/Sources/Danger/GitLabDSL.swift b/Sources/Danger/GitLabDSL.swift
@@ -50,15 +50,15 @@ public extension GitLab {
                 public var id: Int {
                     switch self {
                     case let .group(id), let .project(id):
-                        id
+                        return id
                     }
                 }
 
                 public var isGroup: Bool {
                     if case .group = self {
-                        true
+                        return true
                     } else {
-                        false
+                        return false
                     }
                 }
 

diff --git a/Sources/Danger/Plugins/SwiftLint/SwiftLint.swift b/Sources/Danger/Plugins/SwiftLint/SwiftLint.swift
@@ -27,9 +27,9 @@ public enum SwiftLint {
         var command: String {
             switch self {
             case let .bin(path):
-                path
+                return path
             case let .swiftPackage(path):
-                "swift run --package-path \(path) swiftlint"
+                return "swift run --package-path \(path) swiftlint"
             }
         }
     }
@@ -308,9 +308,9 @@ extension SwiftLint {
 
     private static var tmpSwiftlintOutputFilePath: String {
         if #available(OSX 10.12, *) {
-            FileManager.default.temporaryDirectory.appendingPathComponent("swiftlintReport.json").path
+            return FileManager.default.temporaryDirectory.appendingPathComponent("swiftlintReport.json").path
         } else {
-            NSTemporaryDirectory() + "swiftlintReport.json"
+            return NSTemporaryDirectory() + "swiftlintReport.json"
         }
     }
 }

diff --git a/Sources/Danger/Report.swift b/Sources/Danger/Report.swift
@@ -16,9 +16,9 @@ private var testingResults = DangerResults()
 private var globalResults: DangerResults {
     get {
         if ProcessInfo.processInfo.processName.hasSuffix("xctest") {
-            testingResults
+            return testingResults
         } else {
-            DangerRunner.shared.results
+            return DangerRunner.shared.results
         }
     }
     set {