swift format

Author: yonaskolb

Package.swift

@@ -19,7 +19,7 @@ let package = Package(
         .package(url: "https://github.com/tuist/XcodeProj.git", .exact("7.10.0")),
         .package(url: "https://github.com/jakeheis/SwiftCLI.git", from: "6.0.0"),
         .package(url: "https://github.com/mxcl/Version", from: "2.0.0"),
-        .package(url: "https://github.com/SwiftDocOrg/GraphViz.git", from: "0.1.0")
+        .package(url: "https://github.com/SwiftDocOrg/GraphViz.git", from: "0.1.0"),
     ],
     targets: [
         .target(name: "XcodeGen", dependencies: [

Sources/ProjectSpec/GroupOrdering.swift

@@ -3,30 +3,30 @@ import JSONUtilities
 
 /// Describes an order of groups.
 public struct GroupOrdering: Equatable {
-    
+
     /// A group name pattern.
     public var pattern: String
-    
+
     /// A group name regex.
     public var regex: NSRegularExpression?
-    
+
     /// Subgroups orders.
     public var order: [String]
-    
+
     public init(pattern: String = "", order: [String] = []) {
         self.pattern = pattern
         self.regex = try? NSRegularExpression(pattern: pattern)
         self.order = order
     }
-    
+
 }
 
 extension GroupOrdering: JSONObjectConvertible {
-    
+
     public init(jsonDictionary: JSONDictionary) throws {
         pattern = jsonDictionary.json(atKeyPath: "pattern") ?? ""
         regex = try? NSRegularExpression(pattern: pattern)
         order = jsonDictionary.json(atKeyPath: "order") ?? []
     }
-    
+
 }

Sources/ProjectSpec/NSRegularExpressionExtensions.swift

@@ -1,10 +1,10 @@
 import Foundation
 
 public extension NSRegularExpression {
-    
+
     func isMatch(to string: String) -> Bool {
         let range = NSRange(location: 0, length: string.utf16.count)
         return self.firstMatch(in: string, options: [], range: range) != nil
     }
-    
+
 }

Sources/ProjectSpec/Project.swift

@@ -186,10 +186,11 @@ extension Project {
         }
         // For backward compatibility of old `localPackages:` format
         if let localPackages: [String] = jsonDictionary.json(atKeyPath: "localPackages") {
-            packages.merge(localPackages.reduce(into: [String: SwiftPackage](), {
+            packages.merge(localPackages.reduce(into: [String: SwiftPackage]()) {
                 // Project name will be obtained by resolved abstractpath's lastComponent for dealing with some path case, like "../"
                 let packageName = (basePath + Path($1).normalize()).lastComponent
-                $0[packageName] = .local(path: $1) })
+                $0[packageName] = .local(path: $1)
+            }
             )
         }
         if jsonDictionary["options"] != nil {

Sources/ProjectSpec/Scheme.swift

@@ -37,7 +37,7 @@ public struct Scheme: Equatable {
             case predefined = "1"
             case gpx = "0"
         }
-        
+
         public var allow: Bool
         public var defaultLocation: String?
 
@@ -333,7 +333,7 @@ extension Scheme.SimulateLocation: JSONObjectConvertible {
 extension Scheme.SimulateLocation: JSONEncodable {
     public func toJSONValue() -> Any {
         var dict: [String: Any] = [
-            "allow": allow
+            "allow": allow,
         ]
 
         if let defaultLocation = defaultLocation {
@@ -367,7 +367,7 @@ extension Scheme.Run: JSONObjectConvertible {
         } else if let string: String = jsonDictionary.json(atKeyPath: "launchAutomaticallySubstyle") {
             launchAutomaticallySubstyle = string
         }
-        
+
         if let askLaunch: Bool = jsonDictionary.json(atKeyPath: "askForAppToLaunch") {
             askForAppToLaunch = askLaunch
         }
@@ -392,7 +392,7 @@ extension Scheme.Run: JSONEncodable {
         if disableMainThreadChecker != Scheme.Run.disableMainThreadCheckerDefault {
             dict["disableMainThreadChecker"] = disableMainThreadChecker
         }
-      
+
         if stopOnEveryMainThreadCheckerIssue != Scheme.Run.stopOnEveryMainThreadCheckerIssueDefault {
             dict["stopOnEveryMainThreadCheckerIssue"] = stopOnEveryMainThreadCheckerIssue
         }

Sources/ProjectSpec/SpecValidation.swift

@@ -196,7 +196,7 @@ extension Project {
 
         for scheme in schemes {
             errors.append(
-                contentsOf: scheme.build.targets.compactMap({ validationError(for: $0.target, in: scheme, action: "build") })
+                contentsOf: scheme.build.targets.compactMap { validationError(for: $0.target, in: scheme, action: "build") }
             )
             if let action = scheme.run, let config = action.config, getConfig(config) == nil {
                 errors.append(.invalidSchemeConfig(scheme: scheme.name, config: config))
@@ -205,10 +205,10 @@ extension Project {
                 errors.append(.invalidSchemeConfig(scheme: scheme.name, config: config))
             }
             errors.append(
-                contentsOf: scheme.test?.targets.compactMap({ validationError(for: $0.targetReference, in: scheme, action: "test") }) ?? []
+                contentsOf: scheme.test?.targets.compactMap { validationError(for: $0.targetReference, in: scheme, action: "test") } ?? []
             )
             errors.append(
-                contentsOf: scheme.test?.coverageTargets.compactMap({ validationError(for: $0, in: scheme, action: "test") }) ?? []
+                contentsOf: scheme.test?.coverageTargets.compactMap { validationError(for: $0, in: scheme, action: "test") } ?? []
             )
             if let action = scheme.profile, let config = action.config, getConfig(config) == nil {
                 errors.append(.invalidSchemeConfig(scheme: scheme.name, config: config))

Sources/ProjectSpec/SwiftPackage.swift

@@ -9,7 +9,7 @@ public enum SwiftPackage: Equatable {
 
     case remote(url: String, versionRequirement: VersionRequirement)
     case local(path: String)
-    
+
     public var isLocal: Bool {
         if case .local = self {
             return true
@@ -80,7 +80,7 @@ extension SwiftPackage: JSONEncodable {
         case .local(let path):
             dictionary["path"] = path
         }
-        
+
         return dictionary
     }
 }

Sources/ProjectSpec/TargetScheme.swift

@@ -98,7 +98,7 @@ extension TargetScheme: JSONEncodable {
         if disableMainThreadChecker != TargetScheme.disableMainThreadCheckerDefault {
             dict["disableMainThreadChecker"] = disableMainThreadChecker
         }
-      
+
         if stopOnEveryMainThreadCheckerIssue != TargetScheme.stopOnEveryMainThreadCheckerIssueDefault {
             dict["stopOnEveryMainThreadCheckerIssue"] = stopOnEveryMainThreadCheckerIssue
         }

Sources/ProjectSpec/VersionExtensions.swift

@@ -1,6 +1,6 @@
 //
 //  File.swift
-//  
+//
 //
 //  Created by Yonas Kolb on 7/2/20.
 //

Sources/XcodeGenKit/CarthageVersionLoader.swift

@@ -23,7 +23,7 @@ class Mutex<T> {
         return try closure(&value)
     }
 
-    func get(closure: (inout T) -> ()) {
+    func get(closure: (inout T) -> Void) {
         semaphore.wait()
         closure(&value)
         semaphore.signal()