Update to Xcode 10.2 (#13)

* Update to Xcode 10.2

* Update macOS test target to 10.10

Author: rahul0x24

.swift-version

@@ -1 +1 @@
-4.0
+5.0

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode10
+osx_image: xcode10.2
 install: true
 branches:
   only:
@@ -14,7 +14,7 @@ cache:
 
 jobs:
   include:
-    - osx_image: xcode10
+    - osx_image: xcode10.2
       script:
         - XCODE_SCHEME=FlexibleDiff-macOS
           XCODE_SDK=macosx

Cartfile.private

@@ -1,2 +1,2 @@
-github "Quick/Nimble" ~> 7.0
-github "Quick/Quick" ~> 1.2
+github "Quick/Nimble" ~> 8.0
+github "Quick/Quick" ~> 2.0

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v7.3.1"
-github "Quick/Quick" "v1.3.2"
+github "Quick/Nimble" "v8.0.1"
+github "Quick/Quick" "v2.0.0"
 github "jspahrsummers/xcconfigs" "0.12"

Carthage/Checkouts/Nimble

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "FlexibleDiff"
-  s.version      = "0.0.7"
+  s.version      = "0.0.8"
   s.summary      = "A Swift collection diffing μframework."
   s.description  = <<-DESC
                    A Swift collection diffing μframework implementing the O(N) Paul Heckel diff algorithm.
@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/RACCommunity/FlexibleDiff.git", :tag => "#{s.version}" }
 
   s.source_files  = "FlexibleDiff/*.{swift}"
-  s.swift_version = "4.0"
+  s.swift_version = "5.0"
 end

Carthage/Checkouts/Quick

@@ -612,6 +612,7 @@
 					};
 					65F8C21621836A8E00924657 = {
 						CreatedOnToolsVersion = 10.0;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					65F8C22521836AA300924657 = {
@@ -628,7 +629,7 @@
 					};
 					9A4CCB171F95DEF000ACF758 = {
 						CreatedOnToolsVersion = 9.0;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 				};
@@ -944,7 +945,7 @@
 				PRODUCT_NAME = FlexibleDiffTests;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1002,7 +1003,7 @@
 				PRODUCT_NAME = FlexibleDiffTests;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1186,6 +1187,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = FlexibleDiffTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1245,6 +1247,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = FlexibleDiffTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.reactivecocoa.FlexibleDiffTests;
 				PRODUCT_NAME = FlexibleDiffTests;
@@ -1335,6 +1338,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.reactivecocoa.FlexibleDiff;
 				PRODUCT_NAME = FlexibleDiff;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1349,6 +1353,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.reactivecocoa.FlexibleDiff;
 				PRODUCT_NAME = FlexibleDiff;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

FlexibleDiff.podspec

@@ -468,11 +468,12 @@ private struct MovePath: Hashable {
 	let source: Int
 	let destination: Int
 
-	var hashValue: Int {
+	func hash(into hasher: inout Hasher) {
 		let sum = source + destination
-		return (sum * (sum + 1)) >> 1 + destination
+		let hash = (sum * (sum + 1)) >> 1 + destination
+		hasher.combine(hash)
 	}
-	
+
 	func shifted(by offset: Int) -> MovePath {
 		return MovePath(source: source + offset, destination: destination + offset)
 	}
@@ -497,9 +498,10 @@ extension Set where Element == Int {
 }
 
 extension Changeset.Move: Hashable {
-	public var hashValue: Int {
+	public func hash(into hasher: inout Hasher) {
 		let sum = source + destination
-		return (sum * (sum + 1)) >> 1 + destination
+		let hash = (sum * (sum + 1)) >> 1 + destination
+		hasher.combine(hash)
 	}
 
 	public static func == (left: Changeset.Move, right: Changeset.Move) -> Bool {

FlexibleDiff.xcodeproj/project.pbxproj

@@ -0,0 +1,18 @@
+// swift-tools-version:5.0
+import PackageDescription
+
+let package = Package(
+    name: "FlexibleDiff",
+    products: [
+        .library(name: "FlexibleDiff", targets: ["FlexibleDiff"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
+        .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0"),
+    ],
+    targets: [
+        .target(name: "FlexibleDiff", path: "FlexibleDiff"),
+        .testTarget(name: "FlexibleDiffTests", dependencies: ["FlexibleDiff", "Quick", "Nimble"], path: "FlexibleDiffTests"),
+    ],
+    swiftLanguageVersions: [.v5]
+)