make format_code

yonaskolb · Sep 1, 2019 · d921d14 · d921d14
1 parent 777b15f
commit d921d14
Show file tree

Hide file tree

Showing 25 changed files with 97 additions and 105 deletions.
diff --git a/Sources/ProjectSpec/AggregateTarget.swift b/Sources/ProjectSpec/AggregateTarget.swift
@@ -70,7 +70,7 @@ extension AggregateTarget: JSONEncodable {
             "configFiles": configFiles,
             "attributes": attributes,
             "buildScripts": buildScripts.map { $0.toJSONValue() },
-            "scheme": scheme?.toJSONValue()
+            "scheme": scheme?.toJSONValue(),
         ] as [String: Any?]
     }
 }

diff --git a/Sources/ProjectSpec/BuildRule.swift b/Sources/ProjectSpec/BuildRule.swift
@@ -86,7 +86,7 @@ extension BuildRule: JSONEncodable {
         var dict: [String: Any?] = [
             "outputFiles": outputFiles,
             "outputFilesCompilerFlags": outputFilesCompilerFlags,
-            "name": name
+            "name": name,
         ]
 
         switch fileType {

diff --git a/Sources/ProjectSpec/BuildScript.swift b/Sources/ProjectSpec/BuildScript.swift
@@ -63,6 +63,7 @@ extension BuildScript: JSONObjectConvertible {
         showEnvVars = jsonDictionary.json(atKeyPath: "showEnvVars") ?? BuildScript.showEnvVarsDefault
     }
 }
+
 extension BuildScript: JSONEncodable {
     public func toJSONValue() -> Any {
         var dict: [String: Any?] = [
@@ -72,7 +73,7 @@ extension BuildScript: JSONEncodable {
             "outputFileLists": outputFileLists,
             "runOnlyWhenInstalling": runOnlyWhenInstalling,
             "name": name,
-            "shell": shell
+            "shell": shell,
         ]
 
         if showEnvVars != BuildScript.showEnvVarsDefault {

diff --git a/Sources/ProjectSpec/Dependency.swift b/Sources/ProjectSpec/Dependency.swift
@@ -89,7 +89,7 @@ extension Dependency: JSONEncodable {
         var dict: [String: Any?] = [
             "embed": embed,
             "codeSign": codeSign,
-            "link": link
+            "link": link,
         ]
 
         if removeHeaders != Dependency.removeHeadersDefault {

diff --git a/Sources/ProjectSpec/Plist.swift b/Sources/ProjectSpec/Plist.swift
@@ -29,7 +29,7 @@ extension Plist: JSONEncodable {
     public func toJSONValue() -> Any {
         return [
             "path": path,
-            "properties": properties
+            "properties": properties,
         ]
     }
 }

diff --git a/Sources/ProjectSpec/Project.swift b/Sources/ProjectSpec/Project.swift
@@ -254,7 +254,7 @@ extension Project: JSONEncodable {
             "configs": Dictionary(uniqueKeysWithValues: configsPairs),
             "aggregateTargets": Dictionary(uniqueKeysWithValues: aggregateTargetsPairs),
             "schemes": Dictionary(uniqueKeysWithValues: schemesPairs),
-            "settingGroups": settingGroups.mapValues { $0.toJSONValue() }
+            "settingGroups": settingGroups.mapValues { $0.toJSONValue() },
         ]
     }
 }
diff --git a/Sources/ProjectSpec/Scheme.swift b/Sources/ProjectSpec/Scheme.swift
@@ -197,7 +197,7 @@ public struct Scheme: Equatable {
 
     public struct Archive: BuildAction {
         public static let revealArchiveInOrganizerDefault = true
-        
+
         public var config: String?
         public var customArchiveName: String?
         public var revealArchiveInOrganizer: Bool
@@ -247,7 +247,7 @@ extension Scheme.ExecutionAction: JSONEncodable {
         return [
             "script": script,
             "name": name,
-            "settingsTarget": settingsTarget
+            "settingsTarget": settingsTarget,
         ]
     }
 }
@@ -271,7 +271,7 @@ extension Scheme.Run: JSONEncodable {
             "preActions": preActions.map { $0.toJSONValue() },
             "postActions": postActions.map { $0.toJSONValue() },
             "environmentVariables": environmentVariables.map { $0.toJSONValue() },
-            "config": config
+            "config": config,
         ]
 
         if disableMainThreadChecker != Scheme.Run.disableMainThreadCheckerDefault {
@@ -316,7 +316,7 @@ extension Scheme.Test: JSONEncodable {
             "preActions": preActions.map { $0.toJSONValue() },
             "postActions": postActions.map { $0.toJSONValue() },
             "environmentVariables": environmentVariables.map { $0.toJSONValue() },
-            "config": config
+            "config": config,
         ]
 
         if gatherCoverageData != Scheme.Test.gatherCoverageDataDefault {
@@ -348,7 +348,7 @@ extension Scheme.Test.TestTarget: JSONEncodable {
         }
 
         var dict: JSONDictionary = [
-            "name": name
+            "name": name,
         ]
 
         if randomExecutionOrder != Scheme.Test.TestTarget.randomExecutionOrderDefault {
@@ -380,7 +380,7 @@ extension Scheme.Profile: JSONEncodable {
             "preActions": preActions.map { $0.toJSONValue() },
             "postActions": postActions.map { $0.toJSONValue() },
             "environmentVariables": environmentVariables.map { $0.toJSONValue() },
-            "config": config
+            "config": config,
         ] as [String: Any?]
     }
 }
@@ -395,7 +395,7 @@ extension Scheme.Analyze: JSONObjectConvertible {
 extension Scheme.Analyze: JSONEncodable {
     public func toJSONValue() -> Any {
         return [
-            "config": config
+            "config": config,
         ]
     }
 }
@@ -581,7 +581,7 @@ extension XCScheme.EnvironmentVariable: JSONEncodable {
     public func toJSONValue() -> Any {
         var dict: [String: Any] = [
             "variable": variable,
-            "value": value
+            "value": value,
         ]
 
         if enabled != XCScheme.EnvironmentVariable.enabledDefault {

diff --git a/Sources/ProjectSpec/Settings.swift b/Sources/ProjectSpec/Settings.swift
@@ -112,7 +112,7 @@ extension Settings: JSONEncodable {
             return [
                 "base": buildSettings,
                 "groups": groups,
-                "configs": configSettings.mapValues { $0.toJSONValue() }
+                "configs": configSettings.mapValues { $0.toJSONValue() },
             ]
         }
         return buildSettings

diff --git a/Sources/ProjectSpec/SpecFile.swift b/Sources/ProjectSpec/SpecFile.swift
@@ -9,7 +9,7 @@ public struct SpecFile {
     public let subSpecs: [SpecFile]
 
     private let filename: String
-    
+
     fileprivate struct Include {
         let path: Path
         let relativePaths: Bool
@@ -92,27 +92,27 @@ public struct SpecFile {
 
     private func resolvedDictionaryWithUniqueTargets() -> JSONDictionary {
         let resolvedSpec = resolvingPaths()
-        
+
         var value = Set<String>()
         return resolvedSpec.mergedDictionary(set: &value)
     }
-    
+
     private func substitute(variables: [String: String], in mergedDictionary: JSONDictionary) -> JSONDictionary {
         var resolvedSpec = mergedDictionary
-        
+
         for (key, value) in variables {
             resolvedSpec = resolvedSpec.replaceString("${\(key)}", with: value)
         }
-        
+
         return resolvedSpec
     }
-    
+
     func mergedDictionary(set mergedTargets: inout Set<String>) -> JSONDictionary {
         let name = (basePath + relativePath + Path(filename)).description
-        
+
         guard !mergedTargets.contains(name) else { return [:] }
         mergedTargets.insert(name)
-        
+
         return jsonDictionary.merged(onto:
             subSpecs
                 .map { $0.mergedDictionary(set: &mergedTargets) }
@@ -137,14 +137,14 @@ public struct SpecFile {
 
 extension Dictionary where Key == String, Value: Any {
 
-    func merged(onto other: Dictionary<Key, Value>) -> Dictionary<Key, Value> {
+    func merged(onto other: [Key: Value]) -> [Key: Value] {
         var merged = other
 
         for (key, value) in self {
             if key.hasSuffix(":REPLACE") {
                 let newKey = key[key.startIndex..<key.index(key.endIndex, offsetBy: -8)]
                 merged[Key(newKey)] = value
-            } else if let dictionary = value as? Dictionary<Key, Value>, let base = merged[key] as? Dictionary<Key, Value> {
+            } else if let dictionary = value as? [Key: Value], let base = merged[key] as? [Key: Value] {
                 merged[key] = dictionary.merged(onto: base) as? Value
             } else if let array = value as? [Any], let base = merged[key] as? [Any] {
                 merged[key] = (base + array) as? Value

diff --git a/Sources/ProjectSpec/Target.swift b/Sources/ProjectSpec/Target.swift
@@ -361,7 +361,6 @@ extension Target: NamedJSONDictionaryConvertible {
     }
 }
 
-
 extension Target: JSONEncodable {
     public func toJSONValue() -> Any {
         var dict: [String: Any?] = [
@@ -372,10 +371,10 @@ extension Target: JSONEncodable {
             "attributes": attributes,
             "sources": sources.map { $0.toJSONValue() },
             "dependencies": dependencies.map { $0.toJSONValue() },
-            "postCompileScripts": postCompileScripts.map{ $0.toJSONValue() },
-            "prebuildScripts": preBuildScripts.map{ $0.toJSONValue() },
-            "postbuildScripts": postBuildScripts.map{ $0.toJSONValue() },
-            "buildRules": buildRules.map{ $0.toJSONValue() },
+            "postCompileScripts": postCompileScripts.map { $0.toJSONValue() },
+            "prebuildScripts": preBuildScripts.map { $0.toJSONValue() },
+            "postbuildScripts": postBuildScripts.map { $0.toJSONValue() },
+            "buildRules": buildRules.map { $0.toJSONValue() },
             "deploymentTarget": deploymentTarget?.deploymentTarget,
             "info": info?.toJSONValue(),
             "entitlements": entitlements?.toJSONValue(),

diff --git a/Sources/ProjectSpec/TargetScheme.swift b/Sources/ProjectSpec/TargetScheme.swift
@@ -72,7 +72,7 @@ extension TargetScheme: JSONEncodable {
             "preActions": preActions.map { $0.toJSONValue() },
             "postActions": postActions.map { $0.toJSONValue() },
         ]
-        
+
         if gatherCoverageData != TargetScheme.gatherCoverageDataDefault {
             dict["gatherCoverageData"] = gatherCoverageData
         }

diff --git a/Sources/ProjectSpec/TargetSource.swift b/Sources/ProjectSpec/TargetSource.swift
@@ -264,7 +264,7 @@ extension TargetSource.BuildPhase.CopyFilesSettings: JSONEncodable {
     public func toJSONValue() -> Any {
         return [
             "destination": destination.rawValue,
-            "subpath": subpath
+            "subpath": subpath,
         ]
     }
 }

diff --git a/Sources/XcodeGenKit/Glob.swift b/Sources/XcodeGenKit/Glob.swift
@@ -6,10 +6,8 @@
 //  Adapted from https://gist.github.com/blakemerryman/76312e1cbf8aec248167
 //  Adapted from https://gist.github.com/efirestone/ce01ae109e08772647eb061b3bb387c3
 
-
 import Foundation
 
-
 public let GlobBehaviorBashV3 = Glob.Behavior(
     supportsGlobstar: false,
     includesFilesFromRootOfGlobstar: false,
@@ -29,7 +27,6 @@ public let GlobBehaviorGradle = Glob.Behavior(
     includesFilesInResultsIfTrailingSlash: true
 )
 
-
 /**
  Finds files on the file system using pattern matching.
  */
@@ -66,7 +63,7 @@ public class Glob: Collection {
     public let blacklistedDirectories: [String]
     var paths = [String]()
     public var startIndex: Int { return paths.startIndex }
-    public var endIndex: Int   { return paths.endIndex   }
+    public var endIndex: Int { return paths.endIndex }
 
     /// Initialize a glob
     ///
@@ -126,7 +123,7 @@ public class Glob: Collection {
     private var globalFlags = GLOB_TILDE | GLOB_BRACE | GLOB_MARK
 
     private func executeGlob(pattern: UnsafePointer<CChar>, gt: UnsafeMutablePointer<glob_t>) -> Bool {
-        return 0 == glob(pattern, globalFlags, nil, gt)
+        return glob(pattern, globalFlags, nil, gt) == 0
     }
 
     private func expandGlobstar(pattern: String) -> [String] {
@@ -234,4 +231,3 @@ private extension Sequence {
         return Array(self)
     }
 }
-
diff --git a/Sources/XcodeGenKit/MD5.swift b/Sources/XcodeGenKit/MD5.swift
@@ -21,7 +21,7 @@ extension String {
     public var md5: String {
         if let data = data(using: .utf8, allowLossyConversion: true) {
             let message = data.withUnsafeBytes { (bytes: UnsafeRawBufferPointer) -> [UInt8] in
-                return Array(bytes)
+                Array(bytes)
             }
 
             let MD5Calculator = MD5(message)
@@ -80,14 +80,14 @@ extension NSMutableData {
 }
 
 protocol HashProtocol {
-    var message: Array<UInt8> { get }
+    var message: [UInt8] { get }
 
     /** Common part for hash calculation. Prepare header data. */
-    func prepare(_ len: Int) -> Array<UInt8>
+    func prepare(_ len: Int) -> [UInt8]
 }
 
 extension HashProtocol {
-    func prepare(_ len: Int) -> Array<UInt8> {
+    func prepare(_ len: Int) -> [UInt8] {
         var tmpMessage = message
 
         // Step 1. Append Padding Bits
@@ -102,13 +102,13 @@ extension HashProtocol {
             msgLength += 1
         }
 
-        tmpMessage += Array<UInt8>(repeating: 0, count: counter)
+        tmpMessage += [UInt8](repeating: 0, count: counter)
         return tmpMessage
     }
 }
 
-func toUInt32Array(_ slice: ArraySlice<UInt8>) -> Array<UInt32> {
-    var result = Array<UInt32>()
+func toUInt32Array(_ slice: ArraySlice<UInt8>) -> [UInt32] {
+    var result = [UInt32]()
     result.reserveCapacity(16)
 
     for idx in stride(from: slice.startIndex, to: slice.endIndex, by: MemoryLayout<UInt32>.size) {
@@ -230,26 +230,22 @@ class MD5: HashProtocol {
                 case 0...15:
                     F = (B & C) | ((~B) & D)
                     g = j
-                    break
                 case 16...31:
                     F = (D & B) | (~D & C)
                     g = (5 * j + 1) % 16
-                    break
                 case 32...47:
                     F = B ^ C ^ D
                     g = (3 * j + 5) % 16
-                    break
                 case 48...63:
                     F = C ^ (B | (~D))
                     g = (7 * j) % 16
-                    break
                 default:
                     break
                 }
                 dTemp = D
                 D = C
                 C = B
-                B = B &+ rotateLeft((A &+ F &+ sines[j] &+ M[g]), bits: shifts[j])
+                B = B &+ rotateLeft(A &+ F &+ sines[j] &+ M[g], bits: shifts[j])
                 A = dTemp
             }
 

diff --git a/Sources/XcodeGenKit/PBXProjGenerator.swift b/Sources/XcodeGenKit/PBXProjGenerator.swift
@@ -999,7 +999,7 @@ extension Target {
     var shouldEmbedDependencies: Bool {
         return type.isApp || type.isTest
     }
-    
+
     var shouldEmbedCarthageDependencies: Bool {
         return (type.isApp && platform != .watchOS)
             || type == .watch2Extension

diff --git a/Sources/XcodeGenKit/SchemeGenerator.swift b/Sources/XcodeGenKit/SchemeGenerator.swift
@@ -107,7 +107,7 @@ public class SchemeGenerator {
         func getExecutionAction(_ action: Scheme.ExecutionAction) -> XCScheme.ExecutionAction {
             // ExecutionActions can require the use of build settings. Xcode allows the settings to come from a build or test target.
             let environmentBuildable = action.settingsTarget.flatMap { settingsTarget in
-                return (buildActionEntries + testBuildTargetEntries)
+                (buildActionEntries + testBuildTargetEntries)
                     .first { settingsTarget == $0.buildableReference.blueprintName }?
                     .buildableReference
             }

diff --git a/Sources/XcodeGenKit/XCProjExtensions.swift b/Sources/XcodeGenKit/XCProjExtensions.swift
@@ -38,7 +38,7 @@ extension PBXProj {
 
 extension Dictionary {
 
-    public var valueArray: Array<Value> {
+    public var valueArray: [Value] {
         return Array(values)
     }
 }