Update to swift3.1 (#19)

* Update to build on Swift 3.1

* Integrate build script steps in .travis.yml rather than having separate script

* Remove noise from .travis.yml script

* Removed unused travisBuild.sh

* Re-add codecov script to .travis.yml

* Consolidate code where NSRegularExpression is used, no need to differentiate between osx and linux

* Remove SWIFT_VERSION env variable frmo .travis.yml and rely on .swift-version file

* Revert .travis.yml changes except xcode8.1 -> xcode8.3

* So, don’t use https://raw.githubusercontent.com/lgaches/swifttravisci/master/travisci as it overrides SWIFT_VERSION to 3.0.1

Author: sportlabsMike

.swift-version

@@ -1 +1 @@
-3.0
+3.1

.travis.yml

@@ -1,12 +1,20 @@
 notifications:
   slack: zewo:VjyVCCQvTOw9yrbzQysZezD1
-os:
-  - linux
-  - osx
 language: generic
-sudo: required
-dist: trusty
-osx_image: xcode8.1
+matrix:
+  include:
+    - os: osx
+      env: JOB=SwiftPM_OSX
+      osx_image: xcode8.3
+    - os: linux
+      env: JOB=SwiftPM_linux
+      dist: trusty
+      sudo: required
+      install:
+        -  travis_retry eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
 script:
-  - eval "$(curl -sL https://raw.githubusercontent.com/lgaches/swifttravisci/master/travisci)"
-  - eval "$(curl -sL https://raw.githubusercontent.com/lgaches/swifttravisci/master/codecov)"
+  - swift build -c release
+  - swift build
+  - swift test
+  - eval "$(curl -sL https://raw.githubusercontent.com/lgaches/swifttravisci/master/codecov)"
+

Sources/GraphQL/Error/SyntaxError.swift

@@ -49,13 +49,9 @@ func highlightSourceAtLocation(source: Source, location: SourceLocation) -> Stri
 }
 
 func splitLines(string: String) -> [String] {
-    #if os(macOS)
-        let nsstring = string as NSString
-        let regex = try! NSRegularExpression(pattern: "\r\n|[\n\r]", options: [])
-    #else
-        let nsstring = NSString(string: string)
-        let regex = try! RegularExpression(pattern: "\r\n|[\n\r]", options: [])
-    #endif
+
+    let nsstring = NSString(string: string)
+    let regex = try! NSRegularExpression(pattern: "\r\n|[\n\r]", options: [])
 
     var lines: [String] = []
     var location = 0

Sources/GraphQL/Language/Location.swift

@@ -10,11 +10,7 @@ func getLocation(source: Source, position: Int) -> SourceLocation {
     var line = 1
     var column = position + 1
 
-    #if os(macOS)
-        let regex = try! NSRegularExpression(pattern: "\r\n|[\n\r]", options: [])
-    #else
-        let regex = try! RegularExpression(pattern: "\r\n|[\n\r]", options: [])
-    #endif
+    let regex = try! NSRegularExpression(pattern: "\r\n|[\n\r]", options: [])
 
     let matches = regex.matches(in: source.body, options: [], range: NSRange(0..<source.body.utf16.count))
 

Sources/GraphQL/Utilities/AssertValidName.swift

@@ -12,11 +12,8 @@ public enum InvalidNameError : Error, CustomStringConvertible {
 }
 
 func assertValid(name: String) throws {
-    #if os(macOS)
-        let regex = try NSRegularExpression(pattern: "^[_a-zA-Z][_a-zA-Z0-9]*$", options: [])
-    #else
-        let regex = try RegularExpression(pattern: "^[_a-zA-Z][_a-zA-Z0-9]*$", options: [])
-    #endif
+    
+    let regex = try NSRegularExpression(pattern: "^[_a-zA-Z][_a-zA-Z0-9]*$", options: [])
 
     let range = regex.rangeOfFirstMatch(in: name, options: [], range: NSRange(0..<name.utf16.count))