Merge pull request #106 from mdiep/xcode-10-2

Move to Swift 4.2 and address Xcode 10.2 warnings

.swift-version

@@ -1 +1 @@
-4.0
+4.2

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.4
+osx_image: xcode10.1
 branches:
   only:
     - master
@@ -8,9 +8,19 @@ xcode_workspace: Tentacle.xcworkspace
 matrix:
   include:
     - xcode_scheme: Tentacle-OSX
+      name: Xcode 10.1 / macOS
       env: XCODE_ACTION="build-for-testing test-without-building"
     - xcode_scheme: Tentacle-iOS
+      name: Xcode 10.1 / macOS
       env: XCODE_ACTION="build-for-testing test-without-building"
+    - xcode_scheme: Tentacle-OSX
+      name: Xcode 10.2 / macOS
+      env: XCODE_ACTION="build-for-testing test-without-building"
+      osx_image: xcode10.2
+    - xcode_scheme: Tentacle-iOS
+      name: Xcode 10.2 / macOS
+      env: XCODE_ACTION="build-for-testing test-without-building"
+      osx_image: xcode10.2
     - xcode_scheme: update-test-fixtures
       env: XCODE_ACTION=build
     - git:

Cartfile

@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveSwift" ~> 4.0
+github "ReactiveCocoa/ReactiveSwift" ~> 5.0

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "ReactiveCocoa/ReactiveSwift" "4.0.0"
+github "ReactiveCocoa/ReactiveSwift" "5.0.0"
 github "antitypical/Result" "4.1.0"

Sources/Tentacle/Client.swift

@@ -271,22 +271,24 @@ extension Client.Error: Hashable {
         }
     }
 
-    public var hashValue: Int {
+    public func hash(into hasher: inout Hasher) {
         switch self {
         case let .networkError(error):
-            return (error as NSError).hashValue
+            (error as NSError).hash(into: &hasher)
 
         case let .jsonDeserializationError(error):
-            return (error as NSError).hashValue
+            (error as NSError).hash(into: &hasher)
 
         case let .jsonDecodingError(error):
-            return (error as NSError).hashValue
+            (error as NSError).hash(into: &hasher)
 
         case let .apiError(statusCode, response, error):
-            return statusCode.hashValue ^ response.hashValue ^ error.hashValue
+            statusCode.hash(into: &hasher)
+            response.hash(into: &hasher)
+            error.hash(into: &hasher)
 
         case .doesNotExist:
-            return 4
+            4.hash(into: &hasher)
         }
     }
 }

Sources/Tentacle/Commit.swift

@@ -46,8 +46,8 @@ public struct Commit: ResourceType {
 }
 
 extension Commit: Hashable {
-    public var hashValue: Int {
-        return sha.hashValue
+    public func hash(into hasher: inout Hasher) {
+        sha.hash(into: &hasher)
     }
 
     public static func ==(lhs: Commit, rhs: Commit) -> Bool {

Sources/Tentacle/Content.swift

@@ -28,7 +28,7 @@ extension Repository {
 ///
 /// - file: a file when queried directly in a repository
 /// - directory: a directory when queried directly in a repository (may contain multiple files)
-public enum Content: ResourceType {
+public enum Content: ResourceType, Hashable {
     /// A file in a repository
     public struct File: CustomStringConvertible, ResourceType {
 
@@ -139,9 +139,8 @@ public enum Content: ResourceType {
             case content
         }
 
-        // Hashable
-        public var hashValue: Int {
-            return name.hashValue
+        public func hash(into hasher: inout Hasher) {
+            name.hash(into: &hasher)
         }
     }
 
@@ -164,25 +163,3 @@ public enum Content: ResourceType {
         }
     }
 }
-
-extension Content: Hashable {
-    public static func ==(lhs: Content, rhs: Content) -> Bool {
-        switch (lhs, rhs) {
-        case let (.file(file1), .file(file2)):
-            return file1 == file2
-        case let (.directory(dir1), .directory(dir2)):
-            return dir1 == dir2
-        default:
-            return false
-        }
-    }
-
-    public var hashValue: Int {
-        switch self {
-        case .file(let file):
-            return "file".hashValue ^ file.hashValue
-        case .directory(let files):
-            return files.reduce("directory".hashValue) { $0.hashValue ^ $1.hashValue }
-        }
-    }
-}

Sources/Tentacle/File.swift

@@ -56,8 +56,7 @@ public struct File: ResourceType, Encodable {
         try container.encode(branch, forKey: .branch)
     }
 
-    // Hashable
-    public var hashValue: Int {
-        return message.hashValue
+    public func hash(into hasher: inout Hasher) {
+        message.hash(into: &hasher)
     }
 }

Sources/Tentacle/Identifiable.swift

@@ -13,8 +13,8 @@ public protocol Identifiable: Hashable {
 }
 
 extension Identifiable {
-    public var hashValue: Int {
-        return id.hashValue
+    public func hash(into hasher: inout Hasher) {
+        id.hash(into: &hasher)
     }
 }
 

Sources/Tentacle/Label.swift

@@ -37,9 +37,5 @@ extension Label: Hashable {
     public static func ==(lhs: Label, rhs: Label) -> Bool {
         return lhs.name == rhs.name
     }
-
-    public var hashValue: Int {
-        return name.hashValue
-    }
 }
 

Sources/Tentacle/Repository.swift

@@ -41,7 +41,7 @@ extension Repository: Hashable {
             && lhs.name.caseInsensitiveCompare(rhs.name) == .orderedSame
     }
 
-    public var hashValue: Int {
-        return description.lowercased().hashValue
+    public func hash(into hasher: inout Hasher) {
+        description.lowercased().hash(into: &hasher)
     }
 }

Sources/Tentacle/RepositoryInfo.swift

@@ -128,7 +128,8 @@ extension RepositoryInfo: Hashable {
             && lhs.nameWithOwner == rhs.nameWithOwner
     }
 
-    public var hashValue: Int {
-        return id.hashValue ^ nameWithOwner.hashValue
+    public func hash(into hasher: inout Hasher) {
+        id.hash(into: &hasher)
+        nameWithOwner.hash(into: &hasher)
     }
 }

Sources/Tentacle/Request.swift

@@ -29,12 +29,4 @@ public struct Request<Value>: Hashable {
         self.queryItems = queryItems
         self.body = body
     }
-
-    // Hashable
-    public var hashValue: Int {
-        return method.hashValue
-            ^ path.hashValue
-            ^ queryItems.map { $0.hashValue }.reduce(0, ^)
-            ^ (body?.hashValue ?? 0)
-    }
 }

Sources/Tentacle/Response.swift

@@ -61,11 +61,4 @@ public struct Response: Hashable {
             .map { Date(timeIntervalSince1970: $0) }
         self.links = linksInLinkHeader(headerFields["Link"] as String? ?? "")
     }
-
-    // Hashable
-    public var hashValue: Int {
-        return (rateLimitRemaining?.hashValue ?? 0)
-            ^ (rateLimitReset?.hashValue ?? 0)
-            ^ Array(links.values).reduce(0) { $0 ^ $1.hashValue }
-    }
 }

Sources/Tentacle/Server.swift

@@ -64,7 +64,7 @@ extension Server: Hashable {
         }
     }
 
-    public var hashValue: Int {
-        return endpoint.lowercased().hashValue
+    public func hash(into hasher: inout Hasher) {
+        endpoint.lowercased().hash(into: &hasher)
     }
 }

Sources/Tentacle/Tree.swift

@@ -174,9 +174,8 @@ public struct Tree: CustomStringConvertible, ResourceType {
         }
     }
 
-    // Hashable
-    public var hashValue: Int {
-        return sha.hashValue
+    public func hash(into hasher: inout Hasher) {
+        sha.hash(into: &hasher)
     }
 }
 
@@ -185,8 +184,8 @@ extension Tree.Entry: Hashable {
         return lhs.sha == rhs.sha
     }
 
-    public var hashValue: Int {
-        return sha.hashValue
+    public func hash(into hasher: inout Hasher) {
+        sha.hash(into: &hasher)
     }
 }
 

Sources/Tentacle/User.swift

@@ -175,8 +175,7 @@ public struct UserProfile: ResourceType {
         case company
     }
 
-    // Hashable
-    public var hashValue: Int {
-        return user.hashValue
+    public func hash(into hasher: inout Hasher) {
+        user.hash(into: &hasher)
     }
 }

Tentacle.xcodeproj/project.pbxproj

@@ -691,11 +691,11 @@
 					};
 					BE88E7F11C88C6B30034A112 = {
 						CreatedOnToolsVersion = 7.2.1;
-						LastSwiftMigration = 0810;
+						LastSwiftMigration = 1020;
 					};
 					BE88E7FB1C88C6B30034A112 = {
 						CreatedOnToolsVersion = 7.2.1;
-						LastSwiftMigration = 0810;
+						LastSwiftMigration = 1020;
 					};
 					BE88E8661C88F0990034A112 = {
 						CreatedOnToolsVersion = 7.2.1;
@@ -705,7 +705,7 @@
 			};
 			buildConfigurationList = BE88E7EC1C88C6B30034A112 /* Build configuration list for PBXProject "Tentacle" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -1138,7 +1138,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -1189,7 +1189,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};