Swift 4

Author: Revolucent

CoreDataQueryInterface.xcodeproj/project.pbxproj

@@ -1059,7 +1059,6 @@
 				PRODUCT_NAME = CoreDataQueryInterface;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
@@ -1080,7 +1079,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.prosumma.CoreDataQueryInterface;
 				PRODUCT_NAME = CoreDataQueryInterface;
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Release;

CoreDataQueryInterface/Functions.swift

@@ -44,7 +44,7 @@ public struct FunctionExpression: PredicateComparableTypedExpressionConvertible,
             cdqiParent = nil
         }
         let range = self.function.range(of: ":")!
-        cdqiKey = self.function.substring(to: range.lowerBound)
+        cdqiKey = String(self.function[..<range.lowerBound])
     }
 
     public var cdqiExpression: NSExpression {

CoreDataQueryInterface/Miscellanea.swift

@@ -32,7 +32,7 @@ public func alias(_ expression: KeyPathExpressionConvertible, type: NSAttributeT
 public func subquery<E: EntityAttribute>(_ items: E, _ query: (E) -> NSPredicate) -> ExpressionConvertible {
     let uuid = NSUUID().uuidString
     let index = uuid.index(uuid.startIndex, offsetBy: 6)
-    let randomString = uuid.substring(to: index)
+    let randomString = uuid[..<index]
     let variable = "v\(randomString)"
     return NSExpression(forSubquery: items.cdqiExpression, usingIteratorVariable: variable, predicate: query(E(variable: variable)))
 }

CoreDataQueryInterface/Protocols.swift

@@ -144,8 +144,10 @@ extension KeyPathExpressionConvertible {
         }
         if let parentName = cdqiParent?.cdqiRawName {
             let index = key.index(key.startIndex, offsetBy: 1)
-            let start = key.substring(to: index)
-            let remainder = key.substring(from: index)
+//            let start = key.substring(to: index)
+            let start = key[..<index]
+//            let remainder = key.substring(from: index)
+            let remainder = key[index...]
             let name = "\(start.uppercased())\(remainder)"
             return "\(parentName)\(name)"
         }
@@ -158,7 +160,7 @@ extension KeyPathExpressionConvertible {
 
     public var cdqiExpression: NSExpression {
         if let key = cdqiKey, key.hasPrefix("$") {
-            return NSExpression(forVariable: key.substring(from: key.index(key.startIndex, offsetBy: 1)))
+            return NSExpression(forVariable: String(key[key.index(key.startIndex, offsetBy: 1)...]))
         } else if cdqiKeyPath == "SELF" {
             return NSExpression(format: "SELF")
         }