Merge pull request #265 from exercism/masters3d-swift31

update CI to Swift 3.1

Author: robtimp

.travis.yml

@@ -14,12 +14,19 @@ matrix:
         - ./xswift-test-spm
       env: JOB=SPM
       os: osx
-      osx_image: xcode8.2
+      osx_image: xcode8.3
     - script:
         - bin/fetch-configlet
         - bin/configlet .
         - docker run -v `pwd`:/xswift norionomura/sourcekit:302 bash -c "cd /xswift && ./xswift-test-spm"
-      env: JOB=Linux
+      env: JOB=Linux302
+      sudo: required
+      services: docker
+    - script:
+        - bin/fetch-configlet
+        - bin/configlet .
+        - docker run -v `pwd`:/xswift norionomura/sourcekit:31 bash -c "cd /xswift && ./xswift-test-spm"
+      env: JOB=Linux310
       sudo: required
       services: docker
 

exercises/binary-search-tree/Sources/BinarySearchTreeExample.swift

@@ -20,7 +20,7 @@ indirect enum BinarySearchTree<Element: Comparable> {
 
     init(left: BinarySearchTree<Element> = .empty,
          _ value: Element,
-         right: BinarySearchTree<Element>= .empty ) {
+         right: BinarySearchTree<Element> = .empty ) {
         self = .node(left, value, right)
     }
     init() {

exercises/minesweeper/Sources/MinesweeperExample.swift

@@ -1,7 +1,11 @@
 import Foundation
 
 #if os(Linux)
+#if swift(>=3.1)
+    typealias Regex = NSRegularExpression
+#else
     typealias Regex = RegularExpression
+#endif
 #else
     typealias Regex = NSRegularExpression
 #endif

exercises/robot-name/Tests/RobotNameTests/RobotNameTests.swift

@@ -3,8 +3,12 @@ import Foundation
 @testable import RobotName
 
 #if os(Linux)
+#if swift(>=3.1)
+    typealias Regex = NSRegularExpression
+#else
     typealias Regex = RegularExpression
-#elseif os(OSX)
+#endif
+#else
     typealias Regex = NSRegularExpression
 #endif