Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
run swift format for Swift 5.1
  • Loading branch information
yonaskolb committed Nov 10, 2019
1 parent 7ce43f2 commit 0e4e08b
Show file tree
Hide file tree
Showing 45 changed files with 135 additions and 137 deletions.
2 changes: 1 addition & 1 deletion .swiftformat
@@ -1,6 +1,6 @@
--exclude .build
--exclude .swiftpm
--swiftversion 5.0
--swiftversion 5.1
--disable redundantSelf
--disable sortedImports
--disable blankLinesAtStartOfScope
Expand Down
14 changes: 7 additions & 7 deletions Sources/Core/Glob.swift
Expand Up @@ -62,8 +62,8 @@ public class Glob: Collection {
public let behavior: Behavior
public let blacklistedDirectories: [String]
var paths = [String]()
public var startIndex: Int { return paths.startIndex }
public var endIndex: Int { return paths.endIndex }
public var startIndex: Int { paths.startIndex }
public var endIndex: Int { paths.endIndex }

/// Initialize a glob
///
Expand Down Expand Up @@ -109,21 +109,21 @@ public class Glob: Collection {
// MARK: Subscript Support

public subscript(i: Int) -> String {
return paths[i]
paths[i]
}

// MARK: Protocol of IndexableBase

public func index(after i: Int) -> Int {
return i + 1
i + 1
}

// MARK: Private

private var globalFlags = GLOB_TILDE | GLOB_BRACE | GLOB_MARK

private func executeGlob(pattern: UnsafePointer<CChar>, gt: UnsafeMutablePointer<glob_t>) -> Bool {
return glob(pattern, globalFlags, nil, gt) == 0
glob(pattern, globalFlags, nil, gt) == 0
}

private func expandGlobstar(pattern: String) -> [String] {
Expand Down Expand Up @@ -171,7 +171,7 @@ public class Glob: Collection {
}

private func exploreDirectories(path: String) throws -> [String] {
return try FileManager.default.contentsOfDirectory(atPath: path)
try FileManager.default.contentsOfDirectory(atPath: path)
.compactMap { subpath -> [String]? in
if blacklistedDirectories.contains(subpath) {
return nil
Expand Down Expand Up @@ -228,6 +228,6 @@ public class Glob: Collection {

private extension Sequence {
func array() -> [Element] {
return Array(self)
Array(self)
}
}
6 changes: 3 additions & 3 deletions Sources/Core/MD5.swift
Expand Up @@ -68,7 +68,7 @@ func arrayOfBytes<T>(_ value: T, length: Int? = nil) -> [UInt8] {
extension Int {
/** Array of bytes with optional padding (little-endian) */
func bytes(_ totalBytes: Int = MemoryLayout<Int>.size) -> [UInt8] {
return arrayOfBytes(self, length: totalBytes)
arrayOfBytes(self, length: totalBytes)
}
}

Expand Down Expand Up @@ -147,12 +147,12 @@ struct BytesSequence: Sequence {
let data: [UInt8]

func makeIterator() -> BytesIterator {
return BytesIterator(chunkSize: chunkSize, data: data)
BytesIterator(chunkSize: chunkSize, data: data)
}
}

func rotateLeft(_ value: UInt32, bits: UInt32) -> UInt32 {
return ((value << bits) & 0xFFFF_FFFF) | (value >> (32 - bits))
((value << bits) & 0xFFFF_FFFF) | (value >> (32 - bits))
}

class MD5: HashProtocol {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Core/PathExtensions.swift
Expand Up @@ -11,7 +11,7 @@ extension Path {
/// - `../a/b` simplifies to `../a/b`
/// - `a/../../c` simplifies to `../c`
public func simplifyingParentDirectoryReferences() -> Path {
return normalize().components.reduce(Path(), +)
normalize().components.reduce(Path(), +)
}

/// Returns the relative path necessary to go from `base` to `self`.
Expand Down
8 changes: 4 additions & 4 deletions Sources/ProjectSpec/AggregateTarget.swift
Expand Up @@ -32,14 +32,14 @@ public struct AggregateTarget: ProjectTarget {
extension AggregateTarget: CustomStringConvertible {

public var description: String {
return "\(name)\(targets.isEmpty ? "" : ": \(targets.joined(separator: ", "))")"
"\(name)\(targets.isEmpty ? "" : ": \(targets.joined(separator: ", "))")"
}
}

extension AggregateTarget: Equatable {

public static func == (lhs: AggregateTarget, rhs: AggregateTarget) -> Bool {
return lhs.name == rhs.name &&
lhs.name == rhs.name &&
lhs.targets == rhs.targets &&
lhs.settings == rhs.settings &&
lhs.configFiles == rhs.configFiles &&
Expand All @@ -64,7 +64,7 @@ extension AggregateTarget: NamedJSONDictionaryConvertible {

extension AggregateTarget: JSONEncodable {
public func toJSONValue() -> Any {
return [
[
"settings": settings.toJSONValue(),
"targets": targets,
"configFiles": configFiles,
Expand All @@ -78,7 +78,7 @@ extension AggregateTarget: JSONEncodable {
extension AggregateTarget: PathContainer {

static var pathProperties: [PathProperty] {
return [
[
.dictionary([
.string("configFiles"),
.object("buildScripts", BuildScript.pathProperties),
Expand Down
2 changes: 1 addition & 1 deletion Sources/ProjectSpec/BuildScript.swift
Expand Up @@ -94,7 +94,7 @@ extension BuildScript: JSONEncodable {
extension BuildScript: PathContainer {

static var pathProperties: [PathProperty] {
return [
[
.string("path"),
]
}
Expand Down
6 changes: 3 additions & 3 deletions Sources/ProjectSpec/Dependency.swift
Expand Up @@ -32,11 +32,11 @@ public struct Dependency: Equatable {
self.implicit = implicit
self.weakLink = weakLink
}

public enum CarthageLinkType: String {
case dynamic
case `static`

public static let `default` = dynamic
}

Expand Down Expand Up @@ -139,7 +139,7 @@ extension Dependency: JSONEncodable {
extension Dependency: PathContainer {

static var pathProperties: [PathProperty] {
return [
[
.string("framework"),
]
}
Expand Down
4 changes: 2 additions & 2 deletions Sources/ProjectSpec/DeploymentTarget.swift
Expand Up @@ -55,7 +55,7 @@ extension Version {

/// doesn't print patch if 0
public var deploymentTarget: String {
return "\(major).\(minor)\(patch > 0 ? ".\(patch)" : "")"
"\(major).\(minor)\(patch > 0 ? ".\(patch)" : "")"
}
}

Expand All @@ -81,7 +81,7 @@ extension DeploymentTarget: JSONObjectConvertible {

extension DeploymentTarget: JSONEncodable {
public func toJSONValue() -> Any {
return [
[
"iOS": iOS?.string,
"tvOS": tvOS?.string,
"watchOS": watchOS?.string,
Expand Down
6 changes: 3 additions & 3 deletions Sources/ProjectSpec/Plist.swift
Expand Up @@ -12,7 +12,7 @@ public struct Plist: Equatable {
}

public static func == (lhs: Plist, rhs: Plist) -> Bool {
return lhs.path == rhs.path &&
lhs.path == rhs.path &&
NSDictionary(dictionary: lhs.properties).isEqual(to: rhs.properties)
}
}
Expand All @@ -27,7 +27,7 @@ extension Plist: JSONObjectConvertible {

extension Plist: JSONEncodable {
public func toJSONValue() -> Any {
return [
[
"path": path,
"properties": properties,
]
Expand All @@ -37,7 +37,7 @@ extension Plist: JSONEncodable {
extension Plist: PathContainer {

static var pathProperties: [PathProperty] {
return [
[
.string("path"),
]
}
Expand Down
20 changes: 10 additions & 10 deletions Sources/ProjectSpec/Project.swift
Expand Up @@ -79,27 +79,27 @@ public struct Project: BuildSettingsContainer {
}

public func getProjectReference(_ projectName: String) -> ProjectReference? {
return projectReferencesMap[projectName]
projectReferencesMap[projectName]
}

public func getTarget(_ targetName: String) -> Target? {
return targetsMap[targetName]
targetsMap[targetName]
}

public func getAggregateTarget(_ targetName: String) -> AggregateTarget? {
return aggregateTargetsMap[targetName]
aggregateTargetsMap[targetName]
}

public func getProjectTarget(_ targetName: String) -> ProjectTarget? {
return targetsMap[targetName] ?? aggregateTargetsMap[targetName]
targetsMap[targetName] ?? aggregateTargetsMap[targetName]
}

public func getConfig(_ configName: String) -> Config? {
return configs.first { $0.name == configName }
configs.first { $0.name == configName }
}

public var defaultProjectPath: Path {
return basePath + "\(name).xcodeproj"
basePath + "\(name).xcodeproj"
}
}

Expand Down Expand Up @@ -136,7 +136,7 @@ extension Project: CustomDebugStringConvertible {
extension Project: Equatable {

public static func == (lhs: Project, rhs: Project) -> Bool {
return lhs.name == rhs.name &&
lhs.name == rhs.name &&
lhs.targets == rhs.targets &&
lhs.aggregateTargets == rhs.aggregateTargets &&
lhs.settings == rhs.settings &&
Expand Down Expand Up @@ -216,7 +216,7 @@ extension Project {
extension Project: PathContainer {

static var pathProperties: [PathProperty] {
return [
[
.string("configFiles"),
.string("localPackages"),
.object("options", SpecOptions.pathProperties),
Expand Down Expand Up @@ -259,13 +259,13 @@ extension Project {
extension BuildSettingsContainer {

fileprivate var configFilePaths: [Path] {
return configFiles.values.map { Path($0) }
configFiles.values.map { Path($0) }
}
}

extension Project: JSONEncodable {
public func toJSONValue() -> Any {
return toJSONDictionary()
toJSONDictionary()
}

public func toJSONDictionary() -> JSONDictionary {
Expand Down
2 changes: 1 addition & 1 deletion Sources/ProjectSpec/ProjectReference.swift
Expand Up @@ -20,7 +20,7 @@ extension ProjectReference: NamedJSONDictionaryConvertible {

extension ProjectReference: JSONEncodable {
public func toJSONValue() -> Any {
return [
[
"path": path,
]
}
Expand Down
4 changes: 2 additions & 2 deletions Sources/ProjectSpec/ProjectTarget.swift
Expand Up @@ -11,13 +11,13 @@ public protocol ProjectTarget: BuildSettingsContainer {
extension Target {

public var buildScripts: [BuildScript] {
return preBuildScripts + postCompileScripts + postBuildScripts
preBuildScripts + postCompileScripts + postBuildScripts
}
}

extension Project {

public var projectTargets: [ProjectTarget] {
return targets.map { $0 as ProjectTarget } + aggregateTargets.map { $0 as ProjectTarget }
targets.map { $0 as ProjectTarget } + aggregateTargets.map { $0 as ProjectTarget }
}
}
16 changes: 8 additions & 8 deletions Sources/ProjectSpec/Scheme.swift
Expand Up @@ -126,7 +126,7 @@ public struct Scheme: Equatable {
public static let randomExecutionOrderDefault = false
public static let parallelizableDefault = false

public var name: String { return targetReference.name }
public var name: String { targetReference.name }
public let targetReference: TargetReference
public var randomExecutionOrder: Bool
public var parallelizable: Bool
Expand Down Expand Up @@ -187,7 +187,7 @@ public struct Scheme: Equatable {
}

public var shouldUseLaunchSchemeArgsEnv: Bool {
return commandLineArguments.isEmpty && environmentVariables.isEmpty
commandLineArguments.isEmpty && environmentVariables.isEmpty
}
}

Expand Down Expand Up @@ -219,7 +219,7 @@ public struct Scheme: Equatable {
}

public var shouldUseLaunchSchemeArgsEnv: Bool {
return commandLineArguments.isEmpty && environmentVariables.isEmpty
commandLineArguments.isEmpty && environmentVariables.isEmpty
}
}

Expand Down Expand Up @@ -272,7 +272,7 @@ extension Scheme.ExecutionAction: JSONObjectConvertible {

extension Scheme.ExecutionAction: JSONEncodable {
public func toJSONValue() -> Any {
return [
[
"script": script,
"name": name,
"settingsTarget": settingsTarget,
Expand Down Expand Up @@ -423,7 +423,7 @@ extension Scheme.Profile: JSONObjectConvertible {

extension Scheme.Profile: JSONEncodable {
public func toJSONValue() -> Any {
return [
[
"commandLineArguments": commandLineArguments,
"preActions": preActions.map { $0.toJSONValue() },
"postActions": postActions.map { $0.toJSONValue() },
Expand All @@ -442,7 +442,7 @@ extension Scheme.Analyze: JSONObjectConvertible {

extension Scheme.Analyze: JSONEncodable {
public func toJSONValue() -> Any {
return [
[
"config": config,
]
}
Expand Down Expand Up @@ -491,7 +491,7 @@ extension Scheme: NamedJSONDictionaryConvertible {

extension Scheme: JSONEncodable {
public func toJSONValue() -> Any {
return [
[
"build": build.toJSONValue(),
"run": run?.toJSONValue(),
"test": test?.toJSONValue(),
Expand Down Expand Up @@ -572,7 +572,7 @@ extension BuildType: JSONPrimitiveConvertible {
}

public static var all: [BuildType] {
return [.running, .testing, .profiling, .analyzing, .archiving]
[.running, .testing, .profiling, .analyzing, .archiving]
}
}

Expand Down
4 changes: 2 additions & 2 deletions Sources/ProjectSpec/Settings.swift
Expand Up @@ -37,7 +37,7 @@ public struct Settings: Equatable, JSONObjectConvertible, CustomStringConvertibl
}

public static func == (lhs: Settings, rhs: Settings) -> Bool {
return NSDictionary(dictionary: lhs.buildSettings).isEqual(to: rhs.buildSettings) &&
NSDictionary(dictionary: lhs.buildSettings).isEqual(to: rhs.buildSettings) &&
lhs.configSettings == rhs.configSettings &&
lhs.groups == rhs.groups
}
Expand Down Expand Up @@ -97,7 +97,7 @@ extension Dictionary where Key == String, Value: Any {
}

public func equals(_ dictionary: BuildSettings) -> Bool {
return NSDictionary(dictionary: self).isEqual(to: dictionary)
NSDictionary(dictionary: self).isEqual(to: dictionary)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/ProjectSpec/SpecFile.swift
Expand Up @@ -86,7 +86,7 @@ public struct SpecFile {
}

public func resolvedDictionary(variables: [String: String] = [:]) -> JSONDictionary {
return resolvedDictionaryWithUniqueTargets().expand(variables: variables)
resolvedDictionaryWithUniqueTargets().expand(variables: variables)
}

private func resolvedDictionaryWithUniqueTargets() -> JSONDictionary {
Expand Down

0 comments on commit 0e4e08b

Please sign in to comment.