Updates to swift 4.1 (#14)

- Resolves Coder.getFieldName(codingPath:) returning erroneous verbose output instead of a simple String value with Swift 4.1
Kitura · Mar 5, 2018 · 8821f72 · 8821f72
1 parent a493848
commit 8821f72
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,15 @@ matrix:
     - os: osx
       osx_image: xcode9.2
       sudo: required
+      env: SWIFT_SNAPSHOT=4.0.3
+    - os: linux
+      dist: trusty
+      sudo: required
+      env: SWIFT_SNAPSHOT=swift-4.1-DEVELOPMENT-SNAPSHOT-2018-02-06-a
+    - os: osx
+      osx_image: xcode9.2
+      sudo: required
+      env: SWIFT_SNAPSHOT=swift-4.1-DEVELOPMENT-SNAPSHOT-2018-02-06-a
 
 before_install:
   - git clone https://github.com/IBM-Swift/Package-Builder.git

diff --git a/Sources/KituraContracts/CodableQuery/Coder.swift b/Sources/KituraContracts/CodableQuery/Coder.swift
@@ -32,6 +32,10 @@ public class Coder {
 
     /// Helper method to extract the field name from a CodingKey array
     public static func getFieldName(from codingPath: [CodingKey]) -> String {
-        return codingPath.flatMap({"\($0)"}).joined(separator: ".")
+        #if swift(>=4.1)
+            return codingPath.compactMap({$0.stringValue}).joined(separator: ".")
+        #else
+            return codingPath.flatMap({$0.stringValue}).joined(separator: ".")
+        #endif
     }
 }