Merge pull request kodecocodes#488 from imrvshah/fix/graph-swift-4-update

Fix/graph swift 4 update

Author: kelvinlauKL

Graph/Graph.xcodeproj/project.pbxproj

@@ -158,12 +158,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Swift Algorithm Club";
 				TargetAttributes = {
 					49BFA2FC1CDF886B00522D66 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 0900;
 					};
 					49BFA3061CDF886B00522D66 = {
 						CreatedOnToolsVersion = 7.3;
@@ -247,14 +247,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -297,14 +303,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -349,7 +361,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -370,7 +383,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.swift-algorithm-club.Graph";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

Graph/Graph.xcodeproj/xcshareddata/xcschemes/Graph.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Graph/Graph.xcodeproj/xcshareddata/xcschemes/GraphTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Graph/Graph/AdjacencyListGraph.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-private class EdgeList<T> where T: Equatable, T: Hashable {
+private class EdgeList<T> where T: Hashable {
 
   var vertex: Vertex<T>
   var edges: [Edge<T>]?
@@ -22,7 +22,7 @@ private class EdgeList<T> where T: Equatable, T: Hashable {
 
 }
 
-open class AdjacencyListGraph<T>: AbstractGraph<T> where T: Equatable, T: Hashable {
+open class AdjacencyListGraph<T>: AbstractGraph<T> where T: Hashable {
 
   fileprivate var adjacencyList: [EdgeList<T>] = []
 

Graph/Graph/AdjacencyMatrixGraph.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-open class AdjacencyMatrixGraph<T>: AbstractGraph<T> where T: Equatable, T: Hashable {
+open class AdjacencyMatrixGraph<T>: AbstractGraph<T> where T: Hashable {
 
   // If adjacencyMatrix[i][j] is not nil, then there is an edge from
   // vertex i to vertex j.

Graph/Graph/Edge.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct Edge<T>: Equatable where T: Equatable, T: Hashable {
+public struct Edge<T>: Equatable where T: Hashable {
 
   public let from: Vertex<T>
   public let to: Vertex<T>

Graph/Graph/Graph.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-open class AbstractGraph<T>: CustomStringConvertible where T: Equatable, T: Hashable {
+open class AbstractGraph<T>: CustomStringConvertible where T: Hashable {
 
   public required init() {}
 

Graph/Graph/Vertex.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct Vertex<T>: Equatable where T: Equatable, T: Hashable {
+public struct Vertex<T>: Equatable where T: Hashable {
 
   public var data: T
   public let index: Int
@@ -30,7 +30,7 @@ extension Vertex: Hashable {
 
 }
 
-public func ==<T: Equatable>(lhs: Vertex<T>, rhs: Vertex<T>) -> Bool {
+public func ==<T>(lhs: Vertex<T>, rhs: Vertex<T>) -> Bool {
   guard lhs.index == rhs.index else {
     return false
   }