Support Swift 4.2 (#2)

* migrate to Swift 4.2 package manager description and fix build errors * fix test target path not to contain LinuxMain
autozimu · Nov 27, 2018 · 7107cfc · 7107cfc
1 parent 6a85bc8
commit 7107cfc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0.3
+4.2.0
diff --git a/Package.swift b/Package.swift
@@ -1,5 +1,10 @@
+// swift-tools-version:4.2
 import PackageDescription
 
 let package = Package(
-    name: "StringMetric"
+    name: "StringMetric",
+    targets: [
+        .target(name: "StringMetric", path: "Sources"),
+        .testTarget(name: "StringMetricTests", dependencies: ["StringMetric"], path: "Tests/StringMetricTests")
+    ]
 )
diff --git a/Sources/StringExt.swift b/Sources/StringExt.swift
@@ -1,5 +1,5 @@
 extension String {
-    func index(_ i: Int) -> String.CharacterView.Index {
+    func index(_ i: Int) -> String.Index {
         if i >= 0 {
             return self.index(self.startIndex, offsetBy: i)
         } else {
@@ -16,6 +16,6 @@ extension String {
     }
 
     subscript(r: Range<Int>) -> String {
-        return self[index(r.lowerBound)..<index(r.upperBound)]
+        return String(self[index(r.lowerBound)..<index(r.upperBound)])
     }
 }