feat: Add Swift 4 Support

BREAKING CHANGE: Swift 3 Support is removed

Author: kylef

.travis.yml

@@ -1,8 +1,5 @@
 matrix:
   include:
-    - os: osx
-      osx_image: xcode8.3
-      env: SWIFT_VERSION=3.1.1
     - os: osx
       osx_image: xcode9
       env: SWIFT_VERSION=4.0

CHANGELOG.md

@@ -4,10 +4,12 @@
 
 ### Breaking Changes
 
+- Support for Swift 3 was removed.
 - `ValidationResult.Valid` was renamed to `ValidationResult.valid`.
 
 ### Enhancements
 
+- Support for Swift 4 has been added.
 - `uri` format is now validated.
 
 

JSONSchema.xcodeproj/project.pbxproj

@@ -310,11 +310,11 @@
 				TargetAttributes = {
 					27CF7EE81A9B9EDA0063FDE4 = {
 						CreatedOnToolsVersion = 6.1.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0910;
 					};
 					27CF7EF31A9B9EDA0063FDE4 = {
 						CreatedOnToolsVersion = 6.1.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0910;
 					};
 				};
 			};
@@ -463,6 +463,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -510,6 +511,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -532,7 +534,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -552,7 +555,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocode.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -568,7 +572,8 @@
 				INFOPLIST_FILE = Tests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocode.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -580,7 +585,8 @@
 				INFOPLIST_FILE = Tests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocode.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

Sources/JSONSchema.swift

@@ -21,7 +21,7 @@ public enum Type: Swift.String {
 extension String {
   func stringByRemovingPrefix(_ prefix:String) -> String? {
     if hasPrefix(prefix) {
-      let index = characters.index(startIndex, offsetBy: prefix.characters.count)
+      let index = self.index(startIndex, offsetBy: prefix.count)
       return substring(from: index)
     }
 

Sources/Validators.swift

@@ -193,7 +193,7 @@ func validateEnum(_ values: [Any]) -> (_ value: Any) -> ValidationResult {
 func validateLength(_ comparitor: @escaping ((Int, Int) -> (Bool)), length: Int, error: String) -> (_ value: Any) -> ValidationResult {
   return { value in
     if let value = value as? String {
-      if !comparitor(value.characters.count, length) {
+      if !comparitor(value.count, length) {
         return .invalid([error])
       }
     }
@@ -207,7 +207,7 @@ func validatePattern(_ pattern: String) -> (_ value: Any) -> ValidationResult {
     if let value = value as? String {
       let expression = try? NSRegularExpression(pattern: pattern, options: NSRegularExpression.Options(rawValue: 0))
       if let expression = expression {
-        let range = NSMakeRange(0, value.characters.count)
+        let range = NSMakeRange(0, value.count)
         if expression.matches(in: value, options: NSRegularExpression.MatchingOptions(rawValue: 0), range: range).count == 0 {
           return .invalid(["'\(value)' does not match pattern: '\(pattern)'"])
         }
@@ -344,7 +344,7 @@ func validateProperties(_ properties: [String:Validator]?, patternProperties: [S
           do {
             let expression = try NSRegularExpression(pattern: pattern, options: NSRegularExpression.Options(rawValue: 0))
             let keys = value.keys.filter {
-              (key: String) in expression.matches(in: key, options: NSRegularExpression.MatchingOptions(rawValue: 0), range: NSMakeRange(0, key.characters.count)).count > 0
+              (key: String) in expression.matches(in: key, options: NSRegularExpression.MatchingOptions(rawValue: 0), range: NSMakeRange(0, key.count)).count > 0
             }
 
             allKeys.addObjects(from: Array(keys))
@@ -400,7 +400,7 @@ func validateDependencies(_ key: String, dependencies: [String]) -> (_ value: An
 func validateIPv4(_ value:Any) -> ValidationResult {
   if let ipv4 = value as? String {
     if let expression = try? NSRegularExpression(pattern: "^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", options: NSRegularExpression.Options(rawValue: 0)) {
-      if expression.matches(in: ipv4, options: NSRegularExpression.MatchingOptions(rawValue: 0), range: NSMakeRange(0, ipv4.characters.count)).count == 1 {
+      if expression.matches(in: ipv4, options: NSRegularExpression.MatchingOptions(rawValue: 0), range: NSMakeRange(0, ipv4.count)).count == 1 {
         return .valid
       }
     }
@@ -429,10 +429,10 @@ func validateURI(_ value:Any) -> ValidationResult {
     // Using the regex from http://blog.dieweltistgarnichtso.net/constructing-a-regular-expression-that-matches-uris
 
     if let expression = try? NSRegularExpression(pattern: "((?<=\\()[A-Za-z][A-Za-z0-9\\+\\.\\-]*:([A-Za-z0-9\\.\\-_~:/\\?#\\[\\]@!\\$&'\\(\\)\\*\\+,;=]|%[A-Fa-f0-9]{2})+(?=\\)))|([A-Za-z][A-Za-z0-9\\+\\.\\-]*:([A-Za-z0-9\\.\\-_~:/\\?#\\[\\]@!\\$&'\\(\\)\\*\\+,;=]|%[A-Fa-f0-9]{2})+)", options: NSRegularExpression.Options(rawValue: 0)) {
-      let result = expression.matches(in: uri, options: NSRegularExpression.MatchingOptions(rawValue: 0), range: NSMakeRange(0, uri.characters.count))
+      let result = expression.matches(in: uri, options: NSRegularExpression.MatchingOptions(rawValue: 0), range: NSMakeRange(0, uri.count))
       if result.count == 1 {
         let foundRange = result[0].range
-        if foundRange.location == 0 && foundRange.length == uri.characters.count {
+        if foundRange.location == 0 && foundRange.length == uri.count {
           return .valid
         }
       }

Tests/JSONSchemaCases.swift

@@ -11,7 +11,7 @@ import XCTest
 import JSONSchema
 
 func fixture(_ named:String, forObject:Any) -> Data {
-  let bundle = Bundle(for:object_getClass(forObject))
+  let bundle = Bundle(for:object_getClass(forObject)!)
   let path = bundle.url(forResource: named, withExtension: nil)!
   let data = try! Data(contentsOf: path)
   return data