Swift 4 Support (#13)

Author: jseibert

.swift-version

@@ -1 +1 @@
-3.0
+4.0

.travis.yml

@@ -5,7 +5,7 @@ matrix:
   include:
     - os: osx
       env: JOB=SwiftPM_OSX
-      osx_image: xcode8.3
+      osx_image: xcode9
     - os: linux
       env: JOB=SwiftPM_linux
       dist: trusty
@@ -17,4 +17,3 @@ script:
   - swift build
   - swift test
   - eval "$(curl -sL https://raw.githubusercontent.com/lgaches/swifttravisci/master/codecov)"
-

Package.swift

@@ -3,6 +3,6 @@ import PackageDescription
 let package = Package(
     name: "Graphiti",
     dependencies: [
-        .Package(url: "https://github.com/GraphQLSwift/GraphQL.git", majorVersion: 0, minor: 2),
+        .Package(url: "https://github.com/GraphQLSwift/GraphQL.git", majorVersion: 0, minor: 3),
     ]
 )

Sources/Graphiti/Graphiti.swift

@@ -24,21 +24,24 @@ func isProtocol(type: Any.Type) -> Bool {
 }
 
 func fixName(_ name: String) -> String {
+    // In Swift 4, String(describing: MyClass.self) appends ' #1' for locally defined classes,
+    // which we consider invalid for a type name. Strip this by copying until the first space.
+    var workingString = name
+    
     if name.hasPrefix("(") {
-        var newName: [Character] = []
-
-        for character in String(name.characters.dropFirst()).characters {
-            if character != " " {
-                newName.append(character)
-            } else {
-                break
-            }
+        workingString = String(name.characters.dropFirst())
+    }
+    
+    var newName: [Character] = []
+    for character in workingString.characters {
+        if character != " " {
+            newName.append(character)
+        } else {
+            break
         }
-
-        return String(newName)
     }
 
-    return name
+    return String(newName)
 }