swift-format

.swift-format

@@ -5,7 +5,7 @@
     },
     "maximumBlankLines": 1,
     "indentConditionalCompilationBlocks": false,
-    "rules": {
-        "AllPublicDeclarationsHaveDocumentation": false
-    }
+    "lineBreakBeforeEachArgument": true,
+    "lineBreakBeforeEachGenericRequirement": true,
+    "respectsExistingLineBreaks": false
 }

DevelopmentDependencies/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.4
 import PackageDescription
 
 let package = Package(
@@ -8,7 +8,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/JosephDuffy/xcutils.git", .branch("master")),
-        .package(url: "https://github.com/apple/swift-format.git", .branch("swift-5.2-branch")),
+        .package(url: "https://github.com/apple/swift-format.git", .exact("0.50400.0")),
     ],
     targets: [
         .target(name: "DevelopmentDependencies"),

Sources/GatheredKit/Action/Action.swift

@@ -6,18 +6,12 @@ public struct Action {
 
     private let performClosure: () -> Void
 
-    public init(
-        title: String,
-        isAvailable: Bool,
-        perform: @escaping () -> Void
-    ) {
+    public init(title: String, isAvailable: Bool, perform: @escaping () -> Void) {
         self.title = title
         self.isAvailable = isAvailable
         self.performClosure = perform
     }
 
-    public func perform() {
-        performClosure()
-    }
+    public func perform() { performClosure() }
 
 }

Sources/GatheredKit/Controllable/CustomisableUpdateIntervalControllable.swift

@@ -27,8 +27,6 @@ extension CustomisableUpdateIntervalControllable {
      Starts performing period updated. The value of the static variable `defaultUpdateInterval` will
      used for the update interval.
      */
-    public func startUpdating() {
-        startUpdating(every: type(of: self).defaultUpdateInterval)
-    }
+    public func startUpdating() { startUpdating(every: type(of: self).defaultUpdateInterval) }
 
 }

Sources/GatheredKit/Extensions/String+localized.swift

@@ -4,9 +4,7 @@ extension String {
 
     var localized: String {
         let appLocalizedString = NSLocalizedString(self, comment: "")
-        guard appLocalizedString == self else {
-            return appLocalizedString
-        }
+        guard appLocalizedString == self else { return appLocalizedString }
 
         let frameworkBundle = Bundle(for: FrameworkClass.self)
         return NSLocalizedString(self, bundle: frameworkBundle, comment: "")

Sources/GatheredKit/Extensions/castToOptional.swift

@@ -1,24 +1,21 @@
 /// Casts the provided value to `Any?`
-/// 
+///
 /// This method is required because casting an `Any` to `Any?` wraps the original `Any`
 /// in an `Optional`, producing an `Any??`.
-/// 
+///
 /// To get around this issue if the value passed is actually optional it is matched against
 /// the `Optional` case `some`, and the wrapped value is returned, wrapped in an `Optional`, allowing
 /// the compiler to correctly treat it as an `Any?`.
-/// 
+///
 /// If the passed value is not an `Optional` it is wrapped in an `Optional` for concistency.
-/// 
+///
 /// - parameter value: The value to be cast to `Any?`
 /// - returns: The provided value cast to `Any?`
 internal func castToOptional(_ value: Any) -> Any? {
     // swiftlint:disable syntactic_sugar
     switch value {
-    case Optional<Any>.some(let value):
-        return Optional(value)
-    case Optional<Any>.none:
-        return nil
-    default:
-        return Optional(value)
+    case Optional<Any>.some(let value): return Optional(value)
+    case Optional<Any>.none: return nil
+    default: return Optional(value)
     }
 }

Sources/GatheredKit/Properties/Measurements/AccelerationProperty.swift

@@ -13,7 +13,12 @@ extension AnyProperty {
         date: Date = Date()
     ) -> AccelerationProperty {
         return .init(
-            displayName: displayName, value: value, unit: unit, formatter: formatter, date: date)
+            displayName: displayName,
+            value: value,
+            unit: unit,
+            formatter: formatter,
+            date: date
+        )
     }
 
     public static func acceleration(
@@ -24,7 +29,12 @@ extension AnyProperty {
         date: Date = Date()
     ) -> OptionalAccelerationProperty {
         return .init(
-            displayName: displayName, value: value, unit: unit, formatter: formatter, date: date)
+            displayName: displayName,
+            value: value,
+            unit: unit,
+            formatter: formatter,
+            date: date
+        )
     }
 
     public static func metersPerSecondSquared(
@@ -34,8 +44,12 @@ extension AnyProperty {
         date: Date = Date()
     ) -> AccelerationProperty {
         return .init(
-            displayName: displayName, value: value, unit: .metersPerSecondSquared,
-            formatter: formatter, date: date)
+            displayName: displayName,
+            value: value,
+            unit: .metersPerSecondSquared,
+            formatter: formatter,
+            date: date
+        )
     }
 
     public static func metersPerSecondSquared(
@@ -45,8 +59,12 @@ extension AnyProperty {
         date: Date = Date()
     ) -> OptionalAccelerationProperty {
         return .init(
-            displayName: displayName, value: value, unit: .metersPerSecondSquared,
-            formatter: formatter, date: date)
+            displayName: displayName,
+            value: value,
+            unit: .metersPerSecondSquared,
+            formatter: formatter,
+            date: date
+        )
     }
 
     public static func gravity(
@@ -56,7 +74,11 @@ extension AnyProperty {
         date: Date = Date()
     ) -> AccelerationProperty {
         return .init(
-            displayName: displayName, value: value, unit: .gravity, formatter: formatter, date: date
+            displayName: displayName,
+            value: value,
+            unit: .gravity,
+            formatter: formatter,
+            date: date
         )
     }
 
@@ -67,7 +89,11 @@ extension AnyProperty {
         date: Date = Date()
     ) -> OptionalAccelerationProperty {
         return .init(
-            displayName: displayName, value: value, unit: .gravity, formatter: formatter, date: date
+            displayName: displayName,
+            value: value,
+            unit: .gravity,
+            formatter: formatter,
+            date: date
         )
     }
 

Sources/GatheredKit/Properties/Measurements/AngleProperty.swift

@@ -13,7 +13,12 @@ extension AnyProperty {
         date: Date = Date()
     ) -> AngleProperty {
         return AngleProperty(
-            displayName: displayName, value: value, unit: unit, formatter: formatter, date: date)
+            displayName: displayName,
+            value: value,
+            unit: unit,
+            formatter: formatter,
+            date: date
+        )
     }
 
     public static func angle(
@@ -24,7 +29,12 @@ extension AnyProperty {
         date: Date = Date()
     ) -> OptionalAngleProperty {
         return OptionalAngleProperty(
-            displayName: displayName, value: value, unit: unit, formatter: formatter, date: date)
+            displayName: displayName,
+            value: value,
+            unit: unit,
+            formatter: formatter,
+            date: date
+        )
     }
 
     public static func degrees(
@@ -34,7 +44,11 @@ extension AnyProperty {
         date: Date = Date()
     ) -> AngleProperty {
         return AngleProperty(
-            displayName: displayName, value: value, unit: .degrees, formatter: formatter, date: date
+            displayName: displayName,
+            value: value,
+            unit: .degrees,
+            formatter: formatter,
+            date: date
         )
     }
 
@@ -45,7 +59,11 @@ extension AnyProperty {
         date: Date = Date()
     ) -> OptionalAngleProperty {
         return OptionalAngleProperty(
-            displayName: displayName, value: value, unit: .degrees, formatter: formatter, date: date
+            displayName: displayName,
+            value: value,
+            unit: .degrees,
+            formatter: formatter,
+            date: date
         )
     }
 
@@ -56,7 +74,11 @@ extension AnyProperty {
         date: Date = Date()
     ) -> AngleProperty {
         return .init(
-            displayName: displayName, value: value, unit: .radians, formatter: formatter, date: date
+            displayName: displayName,
+            value: value,
+            unit: .radians,
+            formatter: formatter,
+            date: date
         )
     }
 
@@ -67,7 +89,11 @@ extension AnyProperty {
         date: Date = Date()
     ) -> OptionalAngleProperty {
         return .init(
-            displayName: displayName, value: value, unit: .radians, formatter: formatter, date: date
+            displayName: displayName,
+            value: value,
+            unit: .radians,
+            formatter: formatter,
+            date: date
         )
     }
 

Sources/GatheredKit/Properties/Measurements/FrequencyProperty.swift

@@ -13,7 +13,12 @@ extension AnyProperty {
         date: Date = Date()
     ) -> FrequencyProperty {
         return .init(
-            displayName: displayName, value: value, unit: unit, formatter: formatter, date: date)
+            displayName: displayName,
+            value: value,
+            unit: unit,
+            formatter: formatter,
+            date: date
+        )
     }
 
     public static func frequency(
@@ -24,7 +29,12 @@ extension AnyProperty {
         date: Date = Date()
     ) -> OptionalFrequencyProperty {
         return .init(
-            displayName: displayName, value: value, unit: unit, formatter: formatter, date: date)
+            displayName: displayName,
+            value: value,
+            unit: unit,
+            formatter: formatter,
+            date: date
+        )
     }
 
     public static func radiansPerSecond(
@@ -34,8 +44,12 @@ extension AnyProperty {
         date: Date = Date()
     ) -> FrequencyProperty {
         return .init(
-            displayName: displayName, value: value, unit: .radiansPerSecond, formatter: formatter,
-            date: date)
+            displayName: displayName,
+            value: value,
+            unit: .radiansPerSecond,
+            formatter: formatter,
+            date: date
+        )
     }
 
     public static func radiansPerSecond(
@@ -45,8 +59,12 @@ extension AnyProperty {
         date: Date = Date()
     ) -> OptionalFrequencyProperty {
         return .init(
-            displayName: displayName, value: value, unit: .radiansPerSecond, formatter: formatter,
-            date: date)
+            displayName: displayName,
+            value: value,
+            unit: .radiansPerSecond,
+            formatter: formatter,
+            date: date
+        )
     }
 
 }