Support older versions of Xcode/Swift

jy-freeagent · Dec 25, 2018 · 46474fd · 46474fd
1 parent 7baa4b9
commit 46474fd
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 31 deletions.
diff --git a/Source/CarthageKit/BinaryProject.swift b/Source/CarthageKit/BinaryProject.swift
@@ -2,7 +2,7 @@ import Foundation
 import Result
 
 /// Represents a binary dependency 
-public struct BinaryProject {
+public struct BinaryProject: Equatable {
 	private static let jsonDecoder = JSONDecoder()
 
 	public var versions: [PinnedVersion: URL]
@@ -36,5 +36,3 @@ public struct BinaryProject {
 			}
 	}
 }
-
-extension BinaryProject: Equatable {}
diff --git a/Source/CarthageKit/CompatibilityInfo.swift b/Source/CarthageKit/CompatibilityInfo.swift
@@ -2,7 +2,7 @@ import Foundation
 import Result
 
 /// Identifies a dependency, its pinned version, and its compatible and incompatible requirements
-public struct CompatibilityInfo {
+public struct CompatibilityInfo: Equatable {
 	public typealias Requirements = [Dependency: [Dependency: VersionSpecifier]]
 
 	/// The dependency
@@ -65,5 +65,3 @@ public struct CompatibilityInfo {
 			}
 	}
 }
-
-extension CompatibilityInfo: Equatable {}
diff --git a/Source/CarthageKit/Dependency.swift b/Source/CarthageKit/Dependency.swift
@@ -21,7 +21,7 @@ public struct BinaryURL: CustomStringConvertible {
 }
 
 /// Uniquely identifies a project that can be used as a dependency.
-public enum Dependency {
+public enum Dependency: Hashable {
 	/// A repository hosted on GitHub.com or GitHub Enterprise.
 	case gitHub(Server, Repository)
 
@@ -87,16 +87,12 @@ extension Dependency {
 	}
 }
 
-extension Dependency: Equatable {}
-
 extension Dependency: Comparable {
 	public static func < (_ lhs: Dependency, _ rhs: Dependency) -> Bool {
 		return lhs.name.caseInsensitiveCompare(rhs.name) == .orderedAscending
 	}
 }
 
-extension Dependency: Hashable {}
-
 extension Dependency: Scannable {
 	/// Attempts to parse a Dependency.
 	public static func from(_ scanner: Scanner) -> Result<Dependency, ScannableError> {

diff --git a/Source/CarthageKit/DuplicateDependency.swift b/Source/CarthageKit/DuplicateDependency.swift
@@ -1,5 +1,5 @@
 /// A duplicate dependency, used in CarthageError.duplicateDependencies.
-public struct DuplicateDependency {
+public struct DuplicateDependency: Equatable {
 	/// The duplicate dependency
 	public let dependency: Dependency
 
@@ -32,8 +32,6 @@ extension DuplicateDependency: CustomStringConvertible {
 	}
 }
 
-extension DuplicateDependency: Equatable {}
-
 extension DuplicateDependency: Comparable {
 	public static func < (_ lhs: DuplicateDependency, _ rhs: DuplicateDependency) -> Bool {
 		if lhs.description < rhs.description {

diff --git a/Source/CarthageKit/ScannableError.swift b/Source/CarthageKit/ScannableError.swift
@@ -1,5 +1,5 @@
 /// Error parsing strings into types, used in Scannable protocol
-public struct ScannableError: Error {
+public struct ScannableError: Error, Equatable {
 	let message: String
 	let currentLine: String?
 
@@ -14,5 +14,3 @@ extension ScannableError: CustomStringConvertible {
 		return currentLine.map { "\(message) in line: \($0)" } ?? message
 	}
 }
-
-extension ScannableError: Equatable {}
diff --git a/Source/CarthageKit/Submodule.swift b/Source/CarthageKit/Submodule.swift
@@ -1,5 +1,5 @@
 /// A Git submodule.
-public struct Submodule {
+public struct Submodule: Hashable {
 	/// The name of the submodule. Usually (but not always) the same as the
 	/// path.
 	public let name: String
@@ -21,8 +21,6 @@ public struct Submodule {
 	}
 }
 
-extension Submodule: Hashable {}
-
 extension Submodule: CustomStringConvertible {
 	public var description: String {
 		return "\(name) @ \(sha)"

diff --git a/Source/CarthageKit/SwiftVersionError.swift b/Source/CarthageKit/SwiftVersionError.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-internal enum SwiftVersionError: Error {
+internal enum SwiftVersionError: Error, Equatable {
 	/// An error in determining the local Swift version
 	case unknownLocalSwiftVersion
 
@@ -26,5 +26,3 @@ extension SwiftVersionError: CustomStringConvertible {
 		}
 	}
 }
-
-extension SwiftVersionError: Equatable {}
diff --git a/Source/CarthageKit/Version.swift b/Source/CarthageKit/Version.swift
@@ -6,7 +6,7 @@ import ReactiveSwift
 
 /// A semantic version.
 /// - Note: See <http://semver.org/>
-public struct SemanticVersion {
+public struct SemanticVersion: Hashable {
 	/// The major version.
 	///
 	/// Increments to this component represent incompatible API changes.
@@ -243,8 +243,6 @@ extension Scanner {
 	}
 }
 
-extension SemanticVersion: Equatable {}
-
 extension SemanticVersion: Comparable {
 	public static func < (_ lhs: SemanticVersion, _ rhs: SemanticVersion) -> Bool {
 		if lhs.components == rhs.components {
@@ -254,8 +252,6 @@ extension SemanticVersion: Comparable {
 	}
 }
 
-extension SemanticVersion: Hashable {}
-
 extension SemanticVersion: CustomStringConvertible {
 	public var description: String {
 		var description = components.map { $0.description }.joined(separator: ".")

diff --git a/Source/carthage/Build.swift b/Source/carthage/Build.swift
@@ -214,7 +214,7 @@ public struct BuildCommand: CommandProtocol {
 }
 
 /// Represents the user's chosen platform to build for.
-public enum BuildPlatform {
+public enum BuildPlatform: Equatable {
 	/// Build for all available platforms.
 	case all
 
@@ -259,8 +259,6 @@ public enum BuildPlatform {
 	}
 }
 
-extension BuildPlatform: Equatable {}
-
 extension BuildPlatform: CustomStringConvertible {
 	public var description: String {
 		switch self {